diff --git a/src/MainEditor/UI/ArchivePanel.cpp b/src/MainEditor/UI/ArchivePanel.cpp
index 296eedc6b..31db4cde0 100644
--- a/src/MainEditor/UI/ArchivePanel.cpp
+++ b/src/MainEditor/UI/ArchivePanel.cpp
@@ -692,8 +692,11 @@ void ArchivePanel::addMenus() const
 		auto menu_scripts = new wxMenu();
 #ifndef NO_LUA
 		scriptmanager::populateEditorScriptMenu(menu_scripts, scriptmanager::ScriptType::Archive, "arch_script");
-#endif
 		menu_archive->AppendSubMenu(menu_scripts, "&Run Script");
+#endif
+
+		menu_archive->AppendSeparator();
+		SAction::fromId("arch_run")->addToMenu(menu_archive, true, "Run");
 	}
 	if (!menu_entry)
 	{
diff --git a/src/UI/Dialogs/RunDialog.cpp b/src/UI/Dialogs/RunDialog.cpp
index e2c385ae8..969d3a89d 100644
--- a/src/UI/Dialogs/RunDialog.cpp
+++ b/src/UI/Dialogs/RunDialog.cpp
@@ -188,8 +188,12 @@ class RunConfigDialog : public wxDialog
 RunDialog::RunDialog(wxWindow* parent, Archive* archive, bool show_start_3d_cb, bool run_map) :
 	SDialog(parent, "Run", "run", 500, 400), run_map_{ run_map }
 {
-	// Set dialog icon
+	// Set dialog icon + title
 	wxutil::setWindowIcon(this, "run");
+	if (run_map)
+		SetTitle("Run Map");
+	if (archive)
+		SetTitle(wxString::Format("Run Archive - %s", archive->filename(false)));
 
 	// Setup sizer
 	auto sizer = new wxBoxSizer(wxVERTICAL);