3 files changed, 1 insertions, 11 deletions
diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp
index 1d3bd55ed3..336bf26607 100644
--- a/editor/editor_data.cpp
+++ b/editor/editor_data.cpp
@@ -273,16 +273,6 @@ EditorPlugin *EditorData::get_editor(Object *p_object) {
 	return nullptr;
 }
 
-EditorPlugin *EditorData::get_subeditor(Object *p_object) {
-	for (int i = editor_plugins.size() - 1; i > -1; i--) {
-		if (!editor_plugins[i]->has_main_screen() && editor_plugins[i]->handles(p_object)) {
-			return editor_plugins[i];
-		}
-	}
-
-	return nullptr;
-}
-
 Vector<EditorPlugin *> EditorData::get_subeditors(Object *p_object) {
 	Vector<EditorPlugin *> sub_plugins;
 	for (int i = editor_plugins.size() - 1; i > -1; i--) {
diff --git a/editor/editor_data.h b/editor/editor_data.h
index d5c8c2a713..f14a3fb4e0 100644
--- a/editor/editor_data.h
+++ b/editor/editor_data.h
@@ -144,7 +144,6 @@ private:
 
 public:
 	EditorPlugin *get_editor(Object *p_object);
-	EditorPlugin *get_subeditor(Object *p_object);
 	Vector<EditorPlugin *> get_subeditors(Object *p_object);
 	EditorPlugin *get_editor(String p_name);
 
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 2cef6a6ede..e24cda1932 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -1858,6 +1858,7 @@ void EditorNode::push_item(Object *p_object, const String &p_property, bool p_in
 		node_dock->set_node(nullptr);
 		scene_tree_dock->set_selected(nullptr);
 		inspector_dock->update(nullptr);
+		_display_top_editors(false);
 		return;
 	}