diff --git a/Windows/Debugger/Debugger_Disasm.cpp b/Windows/Debugger/Debugger_Disasm.cpp
index 126aa77ffa..5dd499626d 100644
--- a/Windows/Debugger/Debugger_Disasm.cpp
+++ b/Windows/Debugger/Debugger_Disasm.cpp
@@ -855,4 +855,9 @@ void CDisasm::UpdateDialog(bool _bComplete)
 	for (int i=0; i<numCPUs; i++)
 		if (memoryWindow[i])
 			memoryWindow[i]->Update();
+
+	// repaint windows at the bottom. only the memory view needs to be forced to
+	// redraw. all others are updated manually
+	InvalidateRect (GetDlgItem(m_hDlg, IDC_DEBUGMEMVIEW), NULL, TRUE);
+	UpdateWindow (GetDlgItem(m_hDlg, IDC_DEBUGMEMVIEW));
 }
\ No newline at end of file
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index 9a654ababf..7acaf51cc6 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -383,6 +383,17 @@ namespace MainWindow
 		return TRUE;
 	}
 
+	void CreateDebugWindows() {
+		disasmWindow[0] = new CDisasm(MainWindow::GetHInstance(), MainWindow::GetHWND(), currentDebugMIPS);
+		DialogManager::AddDlg(disasmWindow[0]);
+		EnableWindow (disasmWindow[0]->GetDlgHandle(),FALSE);
+		disasmWindow[0]->Show(g_Config.bShowDebuggerOnLoad);
+
+		memoryWindow[0] = new CMemoryDlg(MainWindow::GetHInstance(), MainWindow::GetHWND(), currentDebugMIPS);
+		DialogManager::AddDlg(memoryWindow[0]);
+		EnableWindow (memoryWindow[0]->GetDlgHandle(),TRUE);
+	}
+
 	void BrowseAndBoot(std::string defaultPath, bool browseDirectory) {
 		std::string fn;
 		std::string filter = "PSP ROMs (*.iso *.cso *.pbp *.elf)|*.pbp;*.elf;*.iso;*.cso;*.prx|All files (*.*)|*.*||";
@@ -704,12 +715,9 @@ namespace MainWindow
 					break;
 
 				case ID_EMULATION_STOP:
-					if (memoryWindow[0]) {
-						SendMessage(memoryWindow[0]->GetDlgHandle(), WM_CLOSE, 0, 0);
-					}
-					if (disasmWindow[0]) {
-						SendMessage(disasmWindow[0]->GetDlgHandle(), WM_CLOSE, 0, 0);
-					}
+					EnableWindow(disasmWindow[0]->GetDlgHandle(),FALSE);
+					EnableWindow(memoryWindow[0]->GetDlgHandle(),FALSE);
+
 					if (Core_IsStepping()) {
 						Core_EnableStepping(false);
 					}
@@ -718,6 +726,11 @@ namespace MainWindow
 					break;
 
 				case ID_EMULATION_RESET:
+					if (Core_IsStepping()) {
+						Core_EnableStepping(false);
+					}
+					EnableWindow(disasmWindow[0]->GetDlgHandle(),FALSE);
+					EnableWindow(memoryWindow[0]->GetDlgHandle(),FALSE);
 					NativeMessageReceived("reset", "");
 					break;
 				case ID_EMULATION_CHEATS:
@@ -980,13 +993,11 @@ namespace MainWindow
 					break;
 
 				case ID_DEBUG_DISASSEMBLY:
-					if (disasmWindow[0])
-						disasmWindow[0]->Show(true);
+					disasmWindow[0]->Show(true);
 					break;
 
 				case ID_DEBUG_MEMORYVIEW:
-					if (memoryWindow[0])
-						memoryWindow[0]->Show(true);
+					memoryWindow[0]->Show(true);
 					break;
 
 				case ID_DEBUG_LOG:
@@ -1192,22 +1203,16 @@ namespace MainWindow
 			break;
 
 		case WM_USER+1:
-			if (disasmWindow[0])
-				SendMessage(disasmWindow[0]->GetDlgHandle(), WM_CLOSE, 0, 0);
-			if (memoryWindow[0])
-				SendMessage(memoryWindow[0]->GetDlgHandle(), WM_CLOSE, 0, 0);
-
-			disasmWindow[0] = new CDisasm(MainWindow::GetHInstance(), MainWindow::GetHWND(), currentDebugMIPS);
-			DialogManager::AddDlg(disasmWindow[0]);
-			disasmWindow[0]->Show(g_Config.bShowDebuggerOnLoad);
 			if (g_Config.bFullScreen)
 				_ViewFullScreen(hWnd);
-			memoryWindow[0] = new CMemoryDlg(MainWindow::GetHInstance(), MainWindow::GetHWND(), currentDebugMIPS);
-			DialogManager::AddDlg(memoryWindow[0]);
-			if (disasmWindow[0])
-				disasmWindow[0]->NotifyMapLoaded();
-			if (memoryWindow[0])
-				memoryWindow[0]->NotifyMapLoaded();
+			
+			EnableWindow (disasmWindow[0]->GetDlgHandle(),TRUE);
+			EnableWindow (memoryWindow[0]->GetDlgHandle(),TRUE);
+
+			disasmWindow[0]->NotifyMapLoaded();
+			memoryWindow[0]->NotifyMapLoaded();
+
+			disasmWindow[0]->UpdateDialog();
 
 			SetForegroundWindow(hwndMain);
 			break;
diff --git a/Windows/WndMainWindow.h b/Windows/WndMainWindow.h
index fa33b052ea..d969b7f659 100644
--- a/Windows/WndMainWindow.h
+++ b/Windows/WndMainWindow.h
@@ -41,6 +41,7 @@ namespace MainWindow
 
 	void Init(HINSTANCE hInstance);
 	BOOL Show(HINSTANCE hInstance, int nCmdShow);
+	void CreateDebugWindows();
 	void Close();
 	void UpdateMenus();
 	void UpdateCommands();
diff --git a/Windows/main.cpp b/Windows/main.cpp
index b9e7597e6a..16fb2d8f5b 100644
--- a/Windows/main.cpp
+++ b/Windows/main.cpp
@@ -125,6 +125,8 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
 	host = new WindowsHost(hwndMain, hwndDisplay);
 	host->SetWindowTitle(0);
 
+	MainWindow::CreateDebugWindows();
+
 	// Emu thread is always running!
 	EmuThread_Start();