diff --git a/source/creator/creator.c b/source/creator/creator.c
index 7da10b06f18..57e4d9c9146 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -342,10 +342,15 @@ int main(int argc, char **argv)
 					 */ 
 					winlay_get_screensize(&sizx, &sizy);
 					setprefsize(0, 0, sizx, sizy);
+#ifdef _WIN32	// FULLSCREEN
+					G.windowstate = G_WINDOWSTATE_BORDER;
+#endif
 					break;
 				case 'W':
 						/* XXX, fixme zr, borderless on win32 */
- 					setfullscreen();
+#ifdef _WIN32	// FULLSCREEN
+					G.windowstate = G_WINDOWSTATE_FULLSCREEN;
+#endif
 					break;
 				case 'n':
 				case 'N':