diff --git a/ddraw.rc b/ddraw.rc
index 9014425..4ffc7dd 100644
--- a/ddraw.rc
+++ b/ddraw.rc
@@ -2,7 +2,7 @@
 #define vxstr(a,b,c,d) str(a##.##b##.##c##.##d)
 #define str(s) #s
 
-#define VERSION 1,2,0,0
+#define VERSION 1,2,0,1
 
 1 VERSIONINFO
 FILEVERSION VERSION
diff --git a/src/main.c b/src/main.c
index 8fd4041..60baea0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -270,6 +270,18 @@ HRESULT __stdcall ddraw_SetDisplayMode(IDirectDrawImpl *This, DWORD width, DWORD
     {
         This->render.width = This->mode.dmPelsWidth;
         This->render.height = This->mode.dmPelsHeight;
+
+        if (This->windowed) //windowed-fullscreen aka borderless
+        {
+            This->border = FALSE;
+            WindowPosX = -1;
+            WindowPosY = -1;
+
+            // prevent OpenGL from going automatically into fullscreen exclusive mode
+            if (This->renderer == render_main)
+                This->render.height++;
+
+        }
     }
 
     if(This->render.width < This->width)