diff --git a/intern/ghost/intern/GHOST_System.cc b/intern/ghost/intern/GHOST_System.cc
index 9625bd45504..513547860d8 100644
--- a/intern/ghost/intern/GHOST_System.cc
+++ b/intern/ghost/intern/GHOST_System.cc
@@ -177,14 +177,12 @@ GHOST_TSuccess GHOST_System::endFullScreen()
   if (m_windowManager->getFullScreen()) {
     // GHOST_IWindow* window = m_windowManager->getFullScreenWindow();
     // GHOST_PRINT("GHOST_System::endFullScreen(): leaving window manager full-screen mode\n");
-    success = m_windowManager->endFullScreen();
-    GHOST_ASSERT(m_displayManager, "GHOST_System::endFullScreen(): invalid display manager");
-    // GHOST_PRINT("GHOST_System::endFullScreen(): leaving full-screen mode\n");
-    success = m_displayManager->setCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay,
-                                                         m_preFullScreenSetting);
-  }
-  else {
-    success = GHOST_kFailure;
+    if (m_windowManager->endFullScreen() == GHOST_kSuccess) {
+      GHOST_ASSERT(m_displayManager, "GHOST_System::endFullScreen(): invalid display manager");
+      // GHOST_PRINT("GHOST_System::endFullScreen(): leaving full-screen mode\n");
+      success = m_displayManager->setCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay,
+                                                           m_preFullScreenSetting);
+    }
   }
   return success;
 }