diff --git a/uppsrc/ide/Debuggers/GdbData.cpp b/uppsrc/ide/Debuggers/GdbData.cpp
index 35a9902f0..962c73dad 100644
--- a/uppsrc/ide/Debuggers/GdbData.cpp
+++ b/uppsrc/ide/Debuggers/GdbData.cpp
@@ -255,7 +255,11 @@ void Gdb::Self()
 
 void Gdb::Cpu()
 {
+#ifdef PLATFORM_WIN32 // mingw dbg is crashing if listing all registers
+	String s = FastCmd("info registers rax rbx rcx rdx rsi rdi rbp rsp r8  r9  r10 r11 r12 r13 r14 r15");
+#else
 	String s = FastCmd("info registers");
+#endif
 	StringStream ss(s);
 	cpu.Clear();
 	bool even = false;
diff --git a/uppsrc/ide/ide.cpp b/uppsrc/ide/ide.cpp
index 9d06aa86c..c8b1559e4 100644
--- a/uppsrc/ide/ide.cpp
+++ b/uppsrc/ide/ide.cpp
@@ -627,8 +627,11 @@ void Ide::Periodic()
 {
 	CheckFileUpdate();
 	SetIcon();
-	if(debugger && debugger->IsFinished() && !IdeIsDebugLock())
+	if(debugger && debugger->IsFinished() && !IdeIsDebugLock()) {
+		DDUMP(~debugger);
+		DDUMP(debugger->IsFinished());
 		IdeEndDebug();
+	}
 }
 
 const Workspace& Ide::IdeWorkspace() const