diff --git a/src/managers/XWaylandManager.cpp b/src/managers/XWaylandManager.cpp
index f329dbe1..2f0632e0 100644
--- a/src/managers/XWaylandManager.cpp
+++ b/src/managers/XWaylandManager.cpp
@@ -43,8 +43,11 @@ void CHyprXWaylandManager::activateSurface(SP<CWLSurfaceResource> pSurface, bool
                 w->m_pXWaylandSurface->restackToTop();
             }
             w->m_pXWaylandSurface->activate(activate);
-        } else
+        } else {
             w->m_pXDGSurface->toplevel->setActive(activate);
+            if (g_pCompositor->m_pLastFocus && g_pCompositor->m_pLastWindow->m_bIsX11)
+                activateSurface(g_pCompositor->m_pLastFocus.lock(), false);
+        }
     }
 }
 
diff --git a/src/xwayland/XWM.cpp b/src/xwayland/XWM.cpp
index f6b6864c..a409b440 100644
--- a/src/xwayland/XWM.cpp
+++ b/src/xwayland/XWM.cpp
@@ -897,7 +897,7 @@ void CXWM::activateSurface(SP<CXWaylandSurface> surf, bool activate) {
     if ((surf == focusedSurface && activate) || (surf && surf->overrideRedirect))
         return;
 
-    if (!surf) {
+    if (!surf || (!activate && g_pCompositor->m_pLastWindow && !g_pCompositor->m_pLastWindow->m_bIsX11)) {
         setActiveWindow((uint32_t)XCB_WINDOW_NONE);
         focusWindow(nullptr);
     } else {