diff --git a/Cargo.lock b/Cargo.lock
index 1b88d1995a7..8d7e1dff4a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1373,7 +1373,7 @@ dependencies = [
 [[package]]
 name = "egui_tiles"
 version = "0.1.0-alpha.1"
-source = "git+https://github.com/rerun-io/egui_tiles?rev=9a6ed5852a0d2f3b18db0c7b8fb1b1bf904b0a51#9a6ed5852a0d2f3b18db0c7b8fb1b1bf904b0a51"
+source = "git+https://github.com/rerun-io/egui_tiles?rev=cd85328bc727ec9cd25d2e52583ec4ec2cff1381#cd85328bc727ec9cd25d2e52583ec4ec2cff1381"
 dependencies = [
  "egui",
  "getrandom",
diff --git a/Cargo.toml b/Cargo.toml
index 3693f94b2dd..146cde6d9f3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -66,7 +66,7 @@ ecolor = "0.21.0"
 eframe = { version = "0.21.3", default-features = false }
 egui = { version = "0.21.0", features = ["extra_debug_asserts", "log"] }
 egui_extras = { version = "0.21.0", features = ["log"] }
-egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", rev = "9a6ed5852a0d2f3b18db0c7b8fb1b1bf904b0a51" }
+egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", rev = "cd85328bc727ec9cd25d2e52583ec4ec2cff1381" }
 egui-wgpu = "0.21.0"
 emath = "0.21.0"
 enumset = "1.0.12"
diff --git a/crates/re_viewer/src/ui/viewport.rs b/crates/re_viewer/src/ui/viewport.rs
index 08a23b6493a..0b488536c18 100644
--- a/crates/re_viewer/src/ui/viewport.rs
+++ b/crates/re_viewer/src/ui/viewport.rs
@@ -684,7 +684,7 @@ impl<'a, 'b> egui_tiles::Behavior<SpaceViewId> for TabViewer<'a, 'b> {
         _tile_id: egui_tiles::TileId,
         tabs: &egui_tiles::Tabs,
     ) {
-        let Some(active) = tiles.get(tabs.active) else { return; };
+        let Some(active) = tabs.active.and_then(|active| tiles.get(active)) else { return; };
         let egui_tiles::Tile::Pane(space_view_id) = active else { return; };
         let space_view_id = *space_view_id;