diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp
index 259b137418ee..a3f9d11243ae 100644
--- a/editor/editor_inspector.cpp
+++ b/editor/editor_inspector.cpp
@@ -1797,7 +1797,6 @@ void EditorInspector::_clear() {
 	property_focusable = -1;
 	editor_property_map.clear();
 	sections.clear();
-	pending.clear();
 	restart_request_props.clear();
 }
 
@@ -1961,11 +1960,8 @@ void EditorInspector::_edit_request_change(Object *p_object, const String &p_pro
 		return;
 	}
 
-	if (p_property == String()) {
-		update_tree_pending = true;
-	} else {
-		pending.insert(p_property);
-	}
+	update_tree_pending |= p_property.empty();
+	update_properties |= !update_all_pending;
 }
 
 void EditorInspector::_edit_set(const String &p_name, const Variant &p_value, bool p_refresh_all, const String &p_changed_field) {
@@ -2198,20 +2194,16 @@ void EditorInspector::_notification(int p_what) {
 
 		if (update_tree_pending) {
 			update_tree();
+			update_properties = false;
 			update_tree_pending = false;
-			pending.clear();
-
-		} else {
-			while (pending.size()) {
-				StringName prop = pending.front()->get();
-				if (editor_property_map.has(prop)) {
-					for (List<EditorProperty *>::Element *E = editor_property_map[prop].front(); E; E = E->next()) {
-						E->get()->update_property();
-						E->get()->update_reload_status();
-					}
+		} else if (update_properties) {
+			for (Map<StringName, List<EditorProperty *>>::Element *E = editor_property_map.front(); E; E = E->next()) {
+				for (List<EditorProperty *>::Element *F = E->value().front(); F; F = F->next()) {
+					F->get()->update_property();
+					F->get()->update_reload_status();
 				}
-				pending.erase(pending.front());
 			}
+			update_properties = false;
 		}
 
 		changing--;
@@ -2307,6 +2299,7 @@ EditorInspector::EditorInspector() {
 	use_folding = false;
 	update_all_pending = false;
 	update_tree_pending = false;
+	update_properties = false;
 	refresh_countdown = 0;
 	read_only = false;
 	search_box = nullptr;
diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h
index b1f1f50746b3..941bf9608bfd 100644
--- a/editor/editor_inspector.h
+++ b/editor/editor_inspector.h
@@ -262,7 +262,6 @@ class EditorInspector : public ScrollContainer {
 	//map use to cache the instanced editors
 	Map<StringName, List<EditorProperty *>> editor_property_map;
 	List<EditorInspectorSection *> sections;
-	Set<StringName> pending;
 
 	void _clear();
 	Object *object;
@@ -279,6 +278,7 @@ class EditorInspector : public ScrollContainer {
 	bool use_folding;
 	int changing;
 	bool update_all_pending;
+	bool update_properties;
 	bool read_only;
 	bool keying;
 	bool sub_inspector;