diff --git a/src/shell/element/stack.rs b/src/shell/element/stack.rs
index d2f9c949..4d198cfa 100644
--- a/src/shell/element/stack.rs
+++ b/src/shell/element/stack.rs
@@ -249,6 +249,10 @@ impl CosmicStack {
             window.set_tiled(false);
 
             p.active.fetch_min(windows.len() - 1, Ordering::SeqCst);
+            p.previous_index
+                .lock()
+                .unwrap()
+                .take_if(|(_, idx)| *idx >= windows.len());
         });
         self.0
             .resize(Size::from((self.active().geometry().size.w, TAB_HEIGHT)));
@@ -276,6 +280,10 @@ impl CosmicStack {
             window.set_tiled(false);
 
             p.active.fetch_min(windows.len() - 1, Ordering::SeqCst);
+            p.previous_index
+                .lock()
+                .unwrap()
+                .take_if(|(_, idx)| *idx >= windows.len());
 
             Some(window)
         });