diff --git a/tools/editor/editor_layout_dialog.cpp b/tools/editor/editor_layout_dialog.cpp
index e37f263c0cd..d3a60f90ddf 100644
--- a/tools/editor/editor_layout_dialog.cpp
+++ b/tools/editor/editor_layout_dialog.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  editor_node.cpp                                                      */
+/*  editor_layout_dialog.cpp                                             */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -35,6 +35,12 @@ void EditorLayoutDialog::clear_layout_name() {
 	layout_name->clear();
 }
 
+void EditorLayoutDialog::_post_popup() {
+
+	ConfirmationDialog::_post_popup();
+	layout_name->grab_focus();
+}
+
 void EditorLayoutDialog::ok_pressed() {
 
 	if (layout_name->get_text()!="") {
diff --git a/tools/editor/editor_layout_dialog.h b/tools/editor/editor_layout_dialog.h
index 7e3b9e3d8a6..be9644f8aef 100644
--- a/tools/editor/editor_layout_dialog.h
+++ b/tools/editor/editor_layout_dialog.h
@@ -43,6 +43,7 @@ protected:
 
 	static void _bind_methods();
 	virtual void ok_pressed();
+	virtual void _post_popup();
 
 public:
 	void clear_layout_name();