diff --git a/src/input.rs b/src/input.rs
index 0af099e..35e181c 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -190,11 +190,15 @@ impl Pinnacle {
             .output_geometry(output)
             .expect("called output_geometry on unmapped output");
 
-        if let Some(lock_surface) = output.with_state(|state| state.lock_surface.clone()) {
-            return Some((
-                PointerFocusTarget::WlSurface(lock_surface.wl_surface().clone()),
-                output_geo.loc,
-            ));
+        if !self.lock_state.is_unlocked() {
+            return output
+                .with_state(|state| state.lock_surface.clone())
+                .map(|lock_surface| {
+                    (
+                        PointerFocusTarget::WlSurface(lock_surface.wl_surface().clone()),
+                        output_geo.loc,
+                    )
+                });
         }
 
         let mut fullscreen_and_up_split_at = 0;