diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp
index b870f01d..54ffb37e 100644
--- a/src/events/Windows.cpp
+++ b/src/events/Windows.cpp
@@ -471,6 +471,8 @@ void Events::listener_mapWindow(void* owner, void* data) {
     if (PWORKSPACE->m_bHasFullscreenWindow && !requestsFullscreen) {
         if (*PNEWTAKESOVERFS == 0)
             PWINDOW->m_bNoInitialFocus = true;
+        else if (*PNEWTAKESOVERFS == 2)
+            g_pCompositor->setWindowFullscreen(g_pCompositor->getFullscreenWindowOnWorkspace(PWORKSPACE->m_iID), false, FULLSCREEN_INVALID);
         else
             requestsFullscreen = true;
     }
diff --git a/subprojects/wlroots b/subprojects/wlroots
index 5ef42e8e..c2aa7fd9 160000
--- a/subprojects/wlroots
+++ b/subprojects/wlroots
@@ -1 +1 @@
-Subproject commit 5ef42e8e8adece098848fac53c721b6eb3818fc2
+Subproject commit c2aa7fd965cb7ee8bed24f4122b720aca8f0fc1e