diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc
index c59a62a9..344d3787 100644
--- a/zsnes/src/gui/guikeys.inc
+++ b/zsnes/src/gui/guikeys.inc
@@ -1196,6 +1196,19 @@ GUIVideoKeys:
     je .nobilinearfilter
     xor byte[BilinearFilter],1
 .nobilinearfilter
+%ifdef __WIN32__
+    cmp dh,'T'
+    jne .notriplebufferwin
+    xor eax,eax
+    mov al,[cvidmode]
+    cmp byte[GUITBWVID+eax],0
+    je near .notriplebufferwin
+    xor byte[TripleBufferWin],1
+;    mov byte[vsyncon],0
+;    mov byte[cfgvsync],0
+    call initDirectDraw
+ .notriplebufferwin
+ %endif
 %ifdef __MSDOS__
     cmp dh,'T'
     jne .notriplebuffer
diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc
index 3c845766..03fed4bb 100644
--- a/zsnes/src/gui/guimouse.inc
+++ b/zsnes/src/gui/guimouse.inc
@@ -2351,11 +2351,19 @@ DisplayGUIVideoClick:
     GUIClickCButton4 61,114,byte[scanlines],byte[cfgscanline],3
     GUIClickCButton4 101,114,byte[scanlines],byte[cfgscanline],2
 .nohsline
+%ifdef __WIN32__
+     xor ebx,ebx
+     mov bl,[cvidmode]
+     cmp byte[GUITBWVID+ebx],0
+     je near .notriplebufferwin
+     GUIClickCButtonf 11,123,byte[TripleBufferWin],initDirectDraw
+.notriplebufferwin
+%endif
     xor ebx,ebx
     mov bl,[cvidmode]
     cmp byte[GUIHQ3X+ebx],0
     je .nocheckboxhq3x
-    GUIClickCButtonHQ 11,123,byte[hq3xFilter]
+    GUIClickCButtonHQ 115,163,byte[hq3xFilter]
 .nocheckboxhq3x
     xor ebx,ebx
     mov bl,[cvidmode]
diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc
index 521db8a4..593465c9 100644
--- a/zsnes/src/gui/guiwindp.inc
+++ b/zsnes/src/gui/guiwindp.inc
@@ -1760,7 +1760,7 @@ DisplayGUIVideo:
 .notext7
     cmp byte[GUITBWVID+eax],0
     je .notext77
-    GUIOuttextwin2u 5,98,178,GUIVideoText10,0
+    GUIOuttextwin2u 5,96,178,GUIVideoText10,0
 .notext77
     xor eax,eax
     mov al,[cvidmode]
@@ -1774,7 +1774,7 @@ DisplayGUIVideo:
     mov al,[cvidmode]
     cmp byte[GUIHQ3X+eax],0
     je near .notext11
-    GUIOuttextwin2u 5,26,128,GUIVideoTexthq3x,1
+    GUIOuttextwin2u 5,130,168,GUIVideoTexthq3x,1
 .notext11
     GUIOuttextwin2u 5,26,188,GUIVideoText8c,0
 %ifndef __LINUX__
@@ -1885,7 +1885,7 @@ DisplayGUIVideo:
     mov al,[cvidmode]
     cmp byte[GUIHQ3X+eax],0
     je near .notext11b
-    GUIOuttextwin2 5,25,127,GUIVideoTexthq3x
+    GUIOuttextwin2 5,129,167,GUIVideoTexthq3x
 .notext11b
     GUIOuttextwin2 5,25,187,GUIVideoText8c
 %ifndef __LINUX__
@@ -2079,7 +2079,7 @@ DisplayGUIVideo:
     je .nocheckbox1hq3x
     mov dword[GUITemp],GUIIconDataCheckBoxC
 .nocheckbox1hq3x
-    GUIDisplayIconWin 5,11,123,[GUITemp]
+    GUIDisplayIconWin 5,115,163,[GUITemp]
 .nocheckbox2hq3x
     DrawGUIWinBox 5,5,26,115,69,167
     DrawSlideBarWin 5,117,34,[GUIcurrentvideoviewloc],[NumVideoModes],5,28,GUIVStA
@@ -2195,12 +2195,12 @@ GUIVideoTexta db 'FULL',0
 GUIVideoTexta2 db '50%',0
 GUIVideoTexta3 db '25%',0
 GUIVideoTextc db '2XSAI ENGINE',0
-GUIVideoTextd db 'SUPER EAGLE ENGINE',0
-GUIVideoTextd2 db 'SUPER 2XSAI ENGINE',0
+GUIVideoTextd db 'SUPER EAGLE',0
+GUIVideoTextd2 db 'SUPER 2XSAI',0
 GUIVideoTextbf db 'BILINEAR FILTER',0
 GUIVideoText3 db 'INTERPOLATION',0      ; -y
 GUIVideoText4 db 'EAGLE ENGINE',0       ; -y
-GUIVideoTexthq3x db 'HQ3X FILTER',0
+GUIVideoTexthq3x db 'HQ3X',0
 GUIVideoText5 db 'FULL SCREEN',0        ; -c
 GUIVideoText5b db 'WIDE SCREEN',0        ; -c
 GUIVideoText6 db 'SMALL SCREEN',0       ; -c