diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index ba16a6c1fb5..fd37eca20f7 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -5702,11 +5702,6 @@ bool EditorNode::ensure_main_scene(bool p_from_native) {
 		return false;
 	}
 
-	if (!EditorNode::validate_custom_directory()) {
-		current_menu_option = -1;
-		return false;
-	}
-
 	return true;
 }
 
diff --git a/editor/gui/editor_run_bar.cpp b/editor/gui/editor_run_bar.cpp
index 9a1223322fc..789694759b1 100644
--- a/editor/gui/editor_run_bar.cpp
+++ b/editor/gui/editor_run_bar.cpp
@@ -218,6 +218,10 @@ void EditorRunBar::_run_scene(const String &p_scene_path, const Vector<String> &
 		return;
 	}
 
+	if (!EditorNode::get_singleton()->validate_custom_directory()) {
+		return;
+	}
+
 	_reset_play_buttons();
 
 	String write_movie_file;