diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 8fa9cbdc1c4..6587e4fe096 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -272,6 +272,8 @@ void EditorNode::_notification(int p_what) {
 		}
 		editor_selection->update();
 
+		scene_root->set_size_override(true, Size2(GlobalConfig::get_singleton()->get("display/window/width"), GlobalConfig::get_singleton()->get("display/window/height")));
+
 		ResourceImporterTexture::get_singleton()->update_imports();
 	}
 	if (p_what == NOTIFICATION_ENTER_TREE) {
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index ae30acf52e8..45485b768e4 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -1184,6 +1184,7 @@ Size2 Control::get_parent_area_size() const {
 
 		parent_size = get_viewport()->get_visible_rect().size;
 	}
+
 	return parent_size;
 }
 
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 763cac2af42..d8ec8b99917 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -1156,6 +1156,7 @@ void Viewport::set_size_override(bool p_enable, const Size2 &p_size, const Vecto
 	size_override_margin = p_margin;
 	_update_rect();
 	_update_stretch_transform();
+	emit_signal("size_changed");
 }
 
 Size2 Viewport::get_size_override() const {