diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 616cb8290..68b45df91 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -902,6 +902,7 @@ void CCompositor::focusSurface(wlr_surface* pSurface, CWindow* pWindowOwner) {
         wlr_seat_keyboard_clear_focus(m_sSeat.seat);
         g_pEventManager->postEvent(SHyprIPCEvent{"activewindow", ","}); // unfocused
         g_pInputManager->m_sIMERelay.onKeyboardFocus(nullptr);
+        g_pCompositor->m_pLastFocus = nullptr;
         return;
     }
 
diff --git a/src/managers/SessionLockManager.cpp b/src/managers/SessionLockManager.cpp
index 5473cb298..c3336acea 100644
--- a/src/managers/SessionLockManager.cpp
+++ b/src/managers/SessionLockManager.cpp
@@ -108,8 +108,6 @@ void CSessionLockManager::onNewSessionLock(wlr_session_lock_v1* pWlrLock) {
 
             g_pCompositor->m_sSeat.exclusiveClient = nullptr;
 
-            g_pInputManager->refocus();
-
             g_pCompositor->focusSurface(nullptr);
 
             for (auto& m : g_pCompositor->m_vMonitors)