diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm
index a43defca..49d42ebc 100644
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -2564,14 +2564,14 @@ guimustrestartmsg:
     GUIBox 43,87,43,151,161
     GUIBox 213,87,213,151,159
     GUIBox 43,151,213,151,158
-    GUIOuttext 56,93,guiqtimemsg1,220-15
-    GUIOuttext 55,92,guiqtimemsg1,220
-    GUIOuttext 56,108,guiqtimemsg2,220-15
-    GUIOuttext 55,107,guiqtimemsg2,220
-    GUIOuttext 56,116,guiqtimemsg3,220-15
-    GUIOuttext 55,115,guiqtimemsg3,220
-    GUIOuttext 56,124,guiqtimemsg4,220-15
-    GUIOuttext 55,123,guiqtimemsg4,220
+    GUIOuttext 56,92,guiqtimemsg1,220-15
+    GUIOuttext 55,91,guiqtimemsg1,220
+    GUIOuttext 56,100,guiqtimemsg2,220-15
+    GUIOuttext 55,99,guiqtimemsg2,220
+    GUIOuttext 56,108,guiqtimemsg3,220-15
+    GUIOuttext 55,107,guiqtimemsg3,220
+    GUIOuttext 56,116,guiqtimemsg4,220-15
+    GUIOuttext 55,115,guiqtimemsg4,220
     GUIOuttext 56,139,guiqtimemsg8,220-15
     GUIOuttext 55,138,guiqtimemsg8,220
     call vidpastecopyscr
@@ -2579,8 +2579,17 @@ guimustrestartmsg:
     call DisplayBoxes
     call DisplayMenu
     call JoyRead
-    cmp byte[pressed+2Ch],0
+
+    mov byte[pressed+2Ch],0
+
+    call JoyRead
+    xor ebx,ebx
+    mov ecx,256+128+64
+.b
+    cmp byte[pressed+ebx],0
     jne .pressedokay
+    inc ebx
+    loop .b
     jmp .again
 .pressedokay
 .again2
diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc
index 77a25da7..3cf4d74f 100644
--- a/zsnes/src/gui/guimouse.inc
+++ b/zsnes/src/gui/guimouse.inc
@@ -994,6 +994,20 @@ GUIWinClicked:
 %%noclick
 %endmacro
 
+%macro GUIClickCButtonat 3
+    cmp eax,%1+1
+    jl %%noclick
+    cmp edx,%2+3
+    jl %%noclick
+    cmp eax,%1+6
+    jg %%noclick
+    cmp edx,%2+8
+    jg %%noclick
+    xor %3,1
+    call guimustrestartmsg
+%%noclick
+%endmacro
+
 %macro GUIClickCButtonC 3
     cmp eax,%1+1
     jl %%noclick
@@ -2107,7 +2121,7 @@ DisplayGUIOptionClick:
     GUIClickCButton 11,166,byte[DontSavePath]
     GUIClickCButton 11,176,byte[SPCDisable]
 %ifdef __WIN32__
-    GUIClickCButton 11,186,byte[AlternateTimer]
+    GUIClickCButtonat 11,186,byte[AlternateTimer]
 %endif
     ; Frameskip = 0
     cmp byte[frameskip],0
@@ -2150,7 +2164,7 @@ DisplayGUIVideoClick:
     GUIClickCButton5 11,163,byte[Triplebufen],1
 .nocheckboxttb
 %ifndef __MSDOS__
-    GUIClickCButton5 11,183,byte[BlackAndWhite],1
+    GUIClickCButton 11,183,byte[BlackAndWhite]
 %endif
     xor ebx,ebx
     mov bl,[cvidmode]