diff --git a/src/BoE.vsproj/ScenEdit/Scen Editor.rc b/src/BoE.vsproj/ScenEdit/Scen Editor.rc
index c38d8ea9a..6fb7c6674 100644
--- a/src/BoE.vsproj/ScenEdit/Scen Editor.rc	
+++ b/src/BoE.vsproj/ScenEdit/Scen Editor.rc	
@@ -105,9 +105,9 @@ BEGIN
         MENUITEM "  &Delete Last Town",         IDM_SCEN_ADV_DELETE_TOWN
         MENUITEM "  Write D&ata To Text File",  IDM_SCEN_ADV_DATA_DUMP
         MENUITEM "  Do &Full Text Dump",        IDM_SCEN_ADV_TEXT_DUMP
-        MENUITEM "  Scenario Shoppin&g Text Dump", IDM_SCEN_ADV_DATA_DUMP
-        MENUITEM "  Scenario &Monster Dump",    IDM_SCEN_ADV_TEXT_DUMP
-        MENUITEM "  Scenario Specials D&ump",   IDM_SCEN_INTRO
+        MENUITEM "  Scenario Shoppin&g Text Dump", IDM_SCEN_PASSWORD
+        MENUITEM "  Scenario &Monster Dump",    IDM_SCEN_PASSWORD
+        MENUITEM "  Scenario Specials D&ump",   IDM_SCEN_PASSWORD
         MENUITEM "  Scenario Ob&ject Data Dump", IDM_SCEN_PASSWORD
     END
     POPUP "&Town"
diff --git a/src/scenedit/scen.menus.win.cpp b/src/scenedit/scen.menus.win.cpp
index 71bbed111..ff7dce530 100644
--- a/src/scenedit/scen.menus.win.cpp
+++ b/src/scenedit/scen.menus.win.cpp
@@ -9,6 +9,7 @@
 // Include this last because some #defines in the Windows headers cause compile errors in my headers.
 // Fortunately they're on symbols not used in this file, so this should work.
 #include <Windows.h>
+#undef HELP_INDEX // Except this one.
 
 // This is the index of each menu on the menubar
 enum {
@@ -34,8 +35,8 @@ void setMenuCommand(HMENU& menu, int i, eMenu cmd) {
 	MENUITEMINFOA item;
 	item.cbSize = sizeof(MENUITEMINFOA);
 	item.fMask = MIIM_ID | MIIM_FTYPE;
-	GetMenuItemInfoA(file_menu, i++, true, &item);
-	if(info.fType == MFT_SEPARATOR) return;
+	GetMenuItemInfoA(menu, i++, true, &item);
+	if(item.fType == MFT_SEPARATOR) return;
 	menuChoices[item.wID] = cmd;
 }
 
@@ -207,6 +208,7 @@ void shut_down_menus(short mode) {
 			EnableMenuItem(out_menu, i, MF_GRAYED | MF_BYPOSITION);
 		}
 	}
+	DrawMenuBar(mainPtr.getSystemHandle());
 }
 
 void handle_file_menu(int item_hit);
@@ -227,7 +229,7 @@ LRESULT CALLBACK menuProc(HWND handle, UINT message, WPARAM wParam, LPARAM lPara
 			handle_item_menu(cmd - 10000);
 		} else if(cmd >= 20000 && cmd < 30000) { // Monster menus
 			handle_monst_menu(cmd - 20000);
-		} else handle_menu_choice(menuChoices[message]);
+		} else handle_menu_choice(menuChoices[cmd]);
 	} else if(message == WM_SETCURSOR) {
 		// Windows resets the cursor to an arrow whenever the mouse moves, unless we do this.
 		// Note: By handling this message, sf::Window::setMouseCursorVisible() will NOT work.