diff --git a/src/shell/layout/tiling/mod.rs b/src/shell/layout/tiling/mod.rs
index 271a1d7f..42549dd1 100644
--- a/src/shell/layout/tiling/mod.rs
+++ b/src/shell/layout/tiling/mod.rs
@@ -5554,10 +5554,9 @@ where
                     .as_ref()
                     .map(|swap_desc| {
                         (swap_desc.node == node_id
-                            || target_tree
-                                .ancestor_ids(&node_id)
-                                .unwrap()
-                                .any(|id| &swap_desc.node == id))
+                            || target_tree.ancestor_ids(&node_id).ok().is_none_or(
+                                |mut ancestors| ancestors.any(|id| &swap_desc.node == id),
+                            ))
                             && swap_desc.stack_window.is_none()
                     })
                     .unwrap_or(false)