diff --git a/src/shell/element/stack.rs b/src/shell/element/stack.rs
index 2d1513c5..e169446f 100644
--- a/src/shell/element/stack.rs
+++ b/src/shell/element/stack.rs
@@ -465,7 +465,9 @@ impl CosmicStack {
         self.0.with_program(|p| {
             if let Some(val) = p.windows.lock().unwrap().iter().position(|w| w == window) {
                 let old = p.active.swap(val, Ordering::SeqCst);
-                p.previous_keyboard.store(old, Ordering::SeqCst);
+                if old != val {
+                    p.previous_keyboard.store(old, Ordering::SeqCst);
+                }
             }
         });
         self.0