diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm
index cc8d2477..1cb970b5 100644
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -546,9 +546,9 @@ NEWSYM UseCubicSpline, db 1
 NEWSYM LargeSoundBuf, db 0
 NEWSYM HighPriority, db 0
 NEWSYM AlwaysOnTop, db 0
-NEWSYM SaveMainWindowPos, db 1
-NEWSYM MainWindowX, dw -1
-NEWSYM MainWindowY, dw -1
+NEWSYM SaveMainWindowPos, db 2
+NEWSYM MainWindowX, dw 0
+NEWSYM MainWindowY, dw 0
 
 GUIsave equ $-GUIRAdd
 
diff --git a/zsnes/src/win/winlink.cpp b/zsnes/src/win/winlink.cpp
index 1caa962d..6531364f 100644
--- a/zsnes/src/win/winlink.cpp
+++ b/zsnes/src/win/winlink.cpp
@@ -1412,7 +1412,9 @@ void initwinvideo(void)
       if(FullScreen==1) {X=0; Y=0;}
       if(hMainWindow) CloseWindow(hMainWindow);
 
-      if (SaveMainWindowPos == 1 && MainWindowX != -1) { X = MainWindowX; Y = MainWindowY; }
+      if (SaveMainWindowPos == 1) { X = MainWindowX; Y = MainWindowY; }
+
+      if (SaveMainWindowPos == 2) SaveMainWindowPos = 1;
 
       hMainWindow = CreateWindow( "ZSNESWIN", WinName, WS_VISIBLE|WS_POPUP,X,Y,  //WS_OVERLAPPED "ZSNESWIN"
                                  WindowWidth,WindowHeight,NULL,NULL,hInst,NULL);