diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index da965082..83dd1d23 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -1144,8 +1144,9 @@ impl Workspaces {
             .or(self.backup_set.as_ref())
             .map(|set| {
                 (
-                    set.previously_active
-                        .map(|(idx, start)| (&set.workspaces[idx], start)),
+                    set.previously_active.and_then(|(idx, start)| {
+                        set.workspaces.get(idx).map(|previous| (previous, start))
+                    }),
                     &set.workspaces[set.active],
                 )
             })