diff --git a/gsplus/src/adb.c b/gsplus/src/adb.c
index fb5407e..a4c4408 100644
--- a/gsplus/src/adb.c
+++ b/gsplus/src/adb.c
@@ -32,6 +32,7 @@ extern byte *g_memory_ptr;
 extern word32 g_mem_size_total;
 extern Kimage g_mainwin_kimage;
 extern Kimage g_debugwin_kimage;
+extern int g_halt_sim;
 
 enum {
 	ADB_IDLE = 0,
@@ -2066,17 +2067,16 @@ adb_physical_key_update(Kimage *kimage_ptr, int raw_a2code, word32 unicode_c,
 				adb_increment_speed();
 			}
 			break;
-		case 0x07: /* F7 - toggle debugger window, SHIFT:fast disk */
+		case 0x07: /* F7 - toggle debugger, SHIFT:fast disk */
 			if(SHIFT_DOWN) {
 				g_fast_disk_emul_en = !g_fast_disk_emul_en;
 				iwm_update_fast_disk_emul(g_fast_disk_emul_en);
 				printf("g_fast_disk_emul_en is now %d\n",
 							g_fast_disk_emul_en);
+			} else if(g_halt_sim) {
+				do_go();
 			} else {
-				video_set_active(&g_debugwin_kimage,
-						!g_debugwin_kimage.active);
-				printf("Toggled debugger window to:%d\n",
-						g_debugwin_kimage.active);
+				halt2_printf("F7 pressed\n");
 			}
 			break;
 		case 0x08: /* F8 - warp pointer */