diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp
index 42272d0e6ec..f2d11c27539 100644
--- a/editor/scene_tree_editor.cpp
+++ b/editor/scene_tree_editor.cpp
@@ -1121,22 +1121,17 @@ SceneTreeEditor::~SceneTreeEditor() {
 
 void SceneTreeDialog::_notification(int p_what) {
 
-	if (p_what == NOTIFICATION_ENTER_TREE) {
-		connect("confirmed", this, "_select");
-	}
-
-	if (p_what == NOTIFICATION_EXIT_TREE) {
-		disconnect("confirmed", this, "_select");
-	}
-	if (p_what == NOTIFICATION_DRAW) {
-
-		RID ci = get_canvas_item();
-		get_stylebox("panel", "PopupMenu")->draw(ci, Rect2(Point2(), get_size()));
-	}
-
-	if (p_what == NOTIFICATION_VISIBILITY_CHANGED && is_visible_in_tree()) {
-
-		tree->update_tree();
+	switch (p_what) {
+		case NOTIFICATION_ENTER_TREE: {
+			connect("confirmed", this, "_select");
+		} break;
+		case NOTIFICATION_EXIT_TREE: {
+			disconnect("confirmed", this, "_select");
+		} break;
+		case NOTIFICATION_VISIBILITY_CHANGED: {
+			if (is_visible_in_tree())
+				tree->update_tree();
+		} break;
 	}
 }
 
@@ -1165,8 +1160,6 @@ SceneTreeDialog::SceneTreeDialog() {
 
 	tree = memnew(SceneTreeEditor(false, false, true));
 	add_child(tree);
-	//set_child_rect(tree);
-
 	tree->get_scene_tree()->connect("item_activated", this, "_select");
 }