diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index ea7ad230..3a1e8300 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -161,6 +161,11 @@ impl WorkspaceSet {
 
         let mut iter = keep.iter();
         self.workspaces.retain(|_| *iter.next().unwrap());
+        self.active -= keep
+            .iter()
+            .take(self.active + 1)
+            .filter(|keep| !**keep)
+            .count();
     }
 
     fn ensure_static<'a>(