diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index a30f6db0b..254056660 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -1411,6 +1411,10 @@ void CCompositor::setWindowFullscreen(CWindow* pWindow, bool on, eFullscreenMode
     if (!windowValidMapped(pWindow))
         return;
 
+    if (!isWorkspaceVisible(pWindow->m_iWorkspaceID)) {
+        g_pKeybindManager->changeworkspace("[internal]" + std::to_string(pWindow->m_iWorkspaceID));
+    }
+
     g_pLayoutManager->getCurrentLayout()->fullscreenRequestForWindow(pWindow, mode, on);
 
     g_pXWaylandManager->setWindowFullscreen(pWindow, pWindow->m_bIsFullscreen && mode == FULLSCREEN_FULL);