diff --git a/src/drivers/win/debugger.cpp b/src/drivers/win/debugger.cpp
index 58656485..a6e87e6f 100644
--- a/src/drivers/win/debugger.cpp
+++ b/src/drivers/win/debugger.cpp
@@ -1940,6 +1940,7 @@ BOOL CALLBACK IDC_DEBUGGER_DISASSEMBLY_WndProc(HWND hwndDlg, UINT uMsg, WPARAM w
 #define MENU_OPTIONS_POS 0
 #define MENU_COLORS_POS 1
 #define MENU_SYMBOLS_POS 2
+#define MENU_TOOLS_POS 3
 
 inline int CheckedFlag(bool b)
 {
@@ -1970,8 +1971,15 @@ inline void UpdateSymbolsPopup(HMENU symbolsPopup)
 	EnableMenuItem(symbolsPopup, ID_DEBUGGER_INLINE_ADDRESS, EnabledFlag(symbDebugEnabled));
 }
 
+inline void UpdateToolsPopup(HMENU symbolsPopup)
+{
+	EnableMenuItem(symbolsPopup, ID_DEBUGGER_ROM_PATCHER, EnabledFlag(GameInfo));
+	EnableMenuItem(symbolsPopup, ID_DEBUGGER_CODE_DUMPER, EnabledFlag(GameInfo));
+}
+
 INT_PTR CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
+    static HMENU toolsPopup = NULL;
 	//these messages get handled at any time
 	switch(uMsg)
 	{
@@ -2064,6 +2072,7 @@ INT_PTR CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lP
 
 			UpdateOptionsPopup(GetSubMenu(hdbgmenu, MENU_OPTIONS_POS));
 			UpdateSymbolsPopup(GetSubMenu(hdbgmenu, MENU_SYMBOLS_POS));
+			UpdateToolsPopup(toolsPopup = GetSubMenu(hdbgmenu, MENU_TOOLS_POS));
 
 			debugger_open = 1;
 			inDebugger = true;
@@ -2268,10 +2277,28 @@ INT_PTR CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lP
 							UpdateSymbolsPopup(GetSubMenu(GetMenu(hwndDlg), MENU_SYMBOLS_POS));
 							UpdateDebugger(false);
 							break;
+						// Tools menu
+						case ID_DEBUGGER_ROM_PATCHER:
+							DoPatcher(-1, hwndDlg);
+							break;
+						case ID_DEBUGGER_CODE_DUMPER:
+							printf("Currently, I can only dump the contents of the visible window to console...\n\n");
+							printf("%ls\n", debug_wstr);
+							break;
 					}
 				}
 			}
 		}
+		case WM_INITMENUPOPUP:
+		{
+			// LOWORD(lParam) == position in parent menu, but we can't get a handle to the parent...
+			HMENU menu = (HMENU)wParam;
+		    if (menu == toolsPopup)
+			{
+				UpdateToolsPopup((HMENU)wParam);
+			}
+			break;
+		}
 	}
 
 	//these messages only get handled when a game is loaded
@@ -2688,7 +2715,7 @@ INT_PTR CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lP
 								UpdateDebugger(false);
 								break;
 							}
-							case IDC_DEBUGGER_ROM_PATCHER: DoPatcher(-1,hwndDlg); break;
+							case IDC_DEBUGGER_ROM_PATCHER: DoPatcher(-1,hwndDlg); break; // TODO: delete/merge with ID_DEBUGGER_ROM_PATCHER
 							case DEBUGGER_CONTEXT_TOGGLEBREAK: DebuggerCallB(hwndDlg, WM_COMMAND, (LBN_DBLCLK * 0x10000) | (IDC_DEBUGGER_BP_LIST), lParam); break;
 						}
 						break;
diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc
index 3da2d6da..4267b346 100644
--- a/src/drivers/win/res.rc
+++ b/src/drivers/win/res.rc
@@ -3041,6 +3041,11 @@ BEGIN
 		MENUITEM "Show Symbol Addresses",       ID_DEBUGGER_INLINE_ADDRESS,    CHECKED
 		MENUITEM "Default Register Names",      ID_DEBUGGER_DEFAULT_REG_NAMES, CHECKED
 	END
+	POPUP "Tools"
+	BEGIN
+		MENUITEM "ROM Patcher...",              ID_DEBUGGER_ROM_PATCHER
+	    MENUITEM "Code Dumper...",              ID_DEBUGGER_CODE_DUMPER
+	END
 END
 
 
diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h
index cbe4d332..fa66a049 100644
--- a/src/drivers/win/resource.h
+++ b/src/drivers/win/resource.h
@@ -1216,6 +1216,8 @@
 #define ID_DEBUGGER_IDA_FONT            45542
 #define ID_DEBUGGER_SHOW_ROM_OFFSETS    45543
 #define ID_DEBUGGER_RESTORE_SIZE        45544
+#define ID_DEBUGGER_ROM_PATCHER         45545
+#define ID_DEBUGGER_CODE_DUMPER         45546
 #define MW_VALUELABEL2                  65423
 #define MW_VALUELABEL1                  65426
 #define IDC_STATIC_SLASHTEXT            65442