diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.tscript
index c0beb15f7..6cfdb0350 100644
--- a/Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.tscript
+++ b/Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.tscript
@@ -286,10 +286,7 @@ function doEditorResetDefaultLevel()
 
 function EditorSaveMissionMenu()
 {
-   if(EditorGui.saveAs)
-      AssetBrowser.setupCreateNewAsset("LevelAsset", AssetBrowser.selectedModule, "EditorSaveMissionAs");
-   else
-      EditorSaveMission();
+   EditorSaveMission();
 }
 
 function EditorSaveMission()
@@ -387,6 +384,8 @@ function EditorSaveMission()
 
 function EditorSaveMissionAs( %levelAsset )
 {
+   EditorGui.saveAs = true;
+   AssetBrowser.setupCreateNewAsset("LevelAsset", AssetBrowser.selectedModule,"");
    // If we didn't get passed a new mission name then
    // prompt the user for one.
    if ( %levelAsset $= "" )
diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.tscript
index 92cefad74..5b21e0630 100644
--- a/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.tscript
+++ b/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.tscript
@@ -142,7 +142,7 @@ function EditorGui::buildMenus(%this)
    %fileMenu.appendItem("Open Recent" TAB RecentLevelsPopupMenu);
    %fileMenu.appendItem("-");
    %fileMenu.appendItem("Save Level" TAB %cmdCtrl SPC "S" TAB "EditorSaveMissionMenu();");
-   %fileMenu.appendItem("Save Level As..." TAB "" TAB "AssetBrowser.setupCreateNewAsset(\"LevelAsset\", AssetBrowser.selectedModule, \"EditorSaveMissionAs\");");
+   %fileMenu.appendItem("Save Level As..." TAB "" TAB "EditorSaveMissionAs();");
    %fileMenu.appendItem("-");
    %fileMenu.appendItem("Save Current Scene as Editor Default" TAB "" TAB "EditorSaveAsDefaultLevel();");
    %fileMenu.appendItem("Reset Editor Default" TAB "" TAB "EditorResetDefaultLevel();");