diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm
index 318ddd23..c90c25eb 100644
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -497,8 +497,8 @@ prevloadl db 0
 prevloaddnamel times 512*10 db 0
 prevloadfnamel times 512*10 db 0
 
-PrevWinMode db 1
-PrevFSMode db 5
+NEWSYM PrevWinMode, db 1
+NEWSYM PrevFSMode, db 5
 
 OldWinPos db 0
 GUIwinposx  dd 0,5   ,60  ,30  ,55  ,50  ,65  ,5   ,30  ,20  ,10   ,80  ,65  ,20  ,70  ,50  ,3   ,50
@@ -1490,12 +1490,6 @@ NEWSYM StartGUI
 ;    jbe .dosport
 %ifndef __MSDOS__
     mov byte[sampratenext+3],0
-%endif
-%ifdef __WIN32__
-    cmp byte[PrevFSMode],5
-    jne .notvm5
-    mov byte[PrevFSMode],7
-.notvm5
 %endif
 
     cmp byte[TripBufAvail],0
diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc
index 2c86275b..fd060f23 100644
--- a/zsnes/src/gui/guimouse.inc
+++ b/zsnes/src/gui/guimouse.inc
@@ -833,10 +833,10 @@ GUIProcVideo:
     mov al,[cvidmode]
     cmp byte[GUIWFVID+eax],1
     je .fullsc
-    mov [PrevWinMode],al
+    mov byte[PrevWinMode],al
     ret
 .fullsc
-    mov [PrevFSMode],al
+    mov byte[PrevFSMode],al
     ret
 .failed
     mov byte[videotroub],0
diff --git a/zsnes/src/win/winlink.cpp b/zsnes/src/win/winlink.cpp
index 8296db29..0fa361ad 100644
--- a/zsnes/src/win/winlink.cpp
+++ b/zsnes/src/win/winlink.cpp
@@ -1491,6 +1491,7 @@ extern unsigned char cvidmode;
 DWORD FirstVid=1;
 DWORD FirstFull=1;
 extern BYTE GUIWFVID[];
+extern BYTE PrevWinMode;
 void clearwin();
 
 char WinName[]={"ZSNESW\0"};
@@ -1511,6 +1512,7 @@ void initwinvideo(void)
       X=0;
       Y=0;
       FullScreen=GUIWFVID[cvidmode];
+      if (GUIWFVID[cvidmode] == 0) PrevWinMode = cvidmode;
 
       switch (cvidmode)
       {