diff --git a/src/cocoa_window.m b/src/cocoa_window.m
index 477a1fad..efdc0c6b 100644
--- a/src/cocoa_window.m
+++ b/src/cocoa_window.m
@@ -931,6 +931,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
             return GL_FALSE;
         }
 
+        _glfwPlatformShowWindow(window);
         [[window->NS.object contentView] enterFullScreenMode:[NSScreen mainScreen]
                                                  withOptions:nil];
     }
diff --git a/src/win32_window.c b/src/win32_window.c
index 844495dd..0b753db1 100644
--- a/src/win32_window.c
+++ b/src/win32_window.c
@@ -965,6 +965,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
     if (window->mode == GLFW_FULLSCREEN)
     {
         // Place the window above all topmost windows
+        _glfwPlatformShowWindow(window);
         SetWindowPos(window->Win32.handle, HWND_TOPMOST, 0,0,0,0,
                      SWP_NOMOVE | SWP_NOSIZE);
     }
diff --git a/src/window.c b/src/window.c
index 7efc450b..f27fbef9 100644
--- a/src/window.c
+++ b/src/window.c
@@ -367,7 +367,7 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
     if (mode == GLFW_FULLSCREEN)
         glfwSetInputMode(window, GLFW_CURSOR_MODE, GLFW_CURSOR_CAPTURED);
 
-    if (mode == GLFW_FULLSCREEN || wndconfig.visible)
+    if (mode == GLFW_WINDOWED && wndconfig.visible)
         glfwShowWindow(window);
 
     return window;
diff --git a/src/x11_window.c b/src/x11_window.c
index bea0c968..9c1ff8d2 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -853,6 +853,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
 
     if (wndconfig->mode == GLFW_FULLSCREEN)
     {
+        _glfwPlatformShowWindow(window);
         enterFullscreenMode(window);
     }