diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index a41fc4989..f3f2bebc0 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -1502,7 +1502,11 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
   FLWindow *nsw = (FLWindow*)[notif object];
   Fl_Window *w = [nsw getFl_Window];
   /* Restore previous fullscreen level */
-  if (w->fullscreen_active() && fl_mac_os_version < 100700) {
+  if (w->fullscreen_active() && (fl_mac_os_version < 100700
+#  if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
+                                 || !(nsw.styleMask & NSWindowStyleMaskFullScreen)
+#endif
+                                 )) {
     [nsw setLevel:NSStatusWindowLevel];
     fixup_window_levels();
   }