diff --git a/src/container/grid.rs b/src/container/grid.rs
index 6631ac4..72c7f00 100644
--- a/src/container/grid.rs
+++ b/src/container/grid.rs
@@ -88,6 +88,7 @@ impl Grid {
         self.children().count()
     }
 
+    /// Includes invisible children.
     pub fn children(&self) -> impl Iterator<Item = &TileId> {
         self.children.iter().filter_map(|c| c.as_ref())
     }
@@ -130,8 +131,7 @@ impl Grid {
         self.children.retain(|child| child.is_some());
     }
 
-    /// Keeps holes
-    pub fn visible_children<Pane>(&self, tiles: &Tiles<Pane>) -> Vec<Option<TileId>> {
+    fn visible_children_and_holes<Pane>(&self, tiles: &Tiles<Pane>) -> Vec<Option<TileId>> {
         self.children
             .iter()
             .filter(|id| id.map_or(true, |id| tiles.is_visible(id)))
@@ -151,20 +151,26 @@ impl Grid {
             self.children.pop();
         }
 
-        let num_visible_children = self.visible_children(tiles).len();
-
         let gap = behavior.gap_width(style);
 
-        let num_cols = match self.layout {
-            GridLayout::Auto => behavior.grid_auto_column_count(num_visible_children, rect, gap),
-            GridLayout::Columns(num_columns) => num_columns.at_least(1),
+        let visible_children_and_holes = self.visible_children_and_holes(tiles);
+
+        // Calculate grid dimensions:
+        let (num_cols, num_rows) = {
+            let num_visible_children = visible_children_and_holes.len();
+
+            let num_cols = match self.layout {
+                GridLayout::Auto => {
+                    behavior.grid_auto_column_count(num_visible_children, rect, gap)
+                }
+                GridLayout::Columns(num_columns) => num_columns,
+            };
+            let num_cols = num_cols.at_least(1);
+            let num_rows = (num_visible_children + num_cols - 1) / num_cols;
+            (num_cols, num_rows)
         };
-        let num_rows = (num_visible_children + num_cols - 1) / num_cols;
 
-        if self.children.len() > num_cols * num_rows {
-            // Too many holes
-            self.collapse_holes();
-        }
+        debug_assert!(visible_children_and_holes.len() <= num_cols * num_rows);
 
         // Figure out where each column and row goes:
         self.col_shares.resize(num_cols, 1.0);
@@ -173,6 +179,9 @@ impl Grid {
         let col_widths = sizes_from_shares(&self.col_shares, rect.width(), gap);
         let row_heights = sizes_from_shares(&self.row_shares, rect.height(), gap);
 
+        debug_assert_eq!(col_widths.len(), num_cols);
+        debug_assert_eq!(row_heights.len(), num_rows);
+
         {
             let mut x = rect.left();
             self.col_ranges.clear();
@@ -190,8 +199,11 @@ impl Grid {
             }
         }
 
+        debug_assert_eq!(self.col_ranges.len(), num_cols);
+        debug_assert_eq!(self.row_ranges.len(), num_rows);
+
         // Layout each child:
-        for (i, &child) in self.visible_children(tiles).iter().enumerate() {
+        for (i, &child) in visible_children_and_holes.iter().enumerate() {
             if let Some(child) = child {
                 let col = i % num_cols;
                 let row = i / num_cols;
@@ -199,6 +211,21 @@ impl Grid {
                 tiles.layout_tile(style, behavior, child_rect, child);
             }
         }
+
+        // Check if we should collapse some holes:
+        {
+            let num_holes = visible_children_and_holes
+                .iter()
+                .filter(|c| c.is_none())
+                .count()
+                + (num_cols * num_rows - visible_children_and_holes.len());
+
+            if num_cols.min(num_rows) <= num_holes {
+                // More holes than there are columns or rows - let's collapse all holes
+                // so that we can shrink for next frame:
+                self.collapse_holes();
+            }
+        }
     }
 
     pub(super) fn ui<Pane>(
@@ -461,3 +488,158 @@ fn sizes_from_shares(shares: &[f32], available_size: f32, gap_width: f32) -> Vec
             .collect()
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::{Container, Tile};
+
+    use super::*;
+
+    #[test]
+    fn test_grid_with_chaos_monkey() {
+        #[derive(Debug)]
+        struct Pane {}
+
+        struct TestBehavior {}
+
+        impl Behavior<Pane> for TestBehavior {
+            fn pane_ui(
+                &mut self,
+                _ui: &mut egui::Ui,
+                _tile_id: TileId,
+                _pane: &mut Pane,
+            ) -> crate::UiResponse {
+                panic!()
+            }
+
+            fn tab_title_for_pane(&mut self, _pane: &Pane) -> egui::WidgetText {
+                panic!()
+            }
+        }
+
+        let mut tree = {
+            let mut tiles = Tiles::default();
+            let panes: Vec<TileId> = vec![tiles.insert_pane(Pane {}), tiles.insert_pane(Pane {})];
+            let root: TileId = tiles.insert_grid_tile(panes);
+            Tree::new(root, tiles)
+        };
+
+        let style = egui::Style::default();
+        let mut behavior = TestBehavior {};
+        let area = egui::Rect::from_min_size(egui::Pos2::ZERO, vec2(1024.0, 768.0));
+
+        // Go crazy on it to make sure we never crash:
+        let mut rng = Pcg64::new_seed(123_456_789_012);
+
+        for _ in 0..1000 {
+            let root = tree.root.unwrap();
+            tree.tiles.layout_tile(&style, &mut behavior, area, root);
+
+            // Add some tiles:
+            for _ in 0..rng.rand_u64() % 3 {
+                if tree.tiles.len() < 100 {
+                    let pane = tree.tiles.insert_pane(Pane {});
+                    if let Some(Tile::Container(Container::Grid(grid))) = tree.tiles.get_mut(root) {
+                        grid.add_child(pane);
+                    } else {
+                        panic!()
+                    }
+                }
+            }
+
+            // Move a random child to then end of the grid:
+            for _ in 0..rng.rand_u64() % 2 {
+                if let Some(Tile::Container(Container::Grid(grid))) = tree.tiles.get_mut(root) {
+                    if !grid.children.is_empty() {
+                        let child_idx = rng.rand_usize() % grid.children.len();
+                        let child = grid.children[child_idx].take();
+                        grid.children.push(child);
+                    }
+                } else {
+                    panic!()
+                }
+            }
+
+            // Flip some visibilities:
+            for _ in 0..rng.rand_u64() % 2 {
+                let children =
+                    if let Some(Tile::Container(Container::Grid(grid))) = tree.tiles.get(root) {
+                        grid.visible_children_and_holes(&tree.tiles)
+                            .iter()
+                            .copied()
+                            .flatten()
+                            .collect_vec()
+                    } else {
+                        panic!()
+                    };
+
+                if !children.is_empty() {
+                    let child_idx = rng.rand_usize() % children.len();
+                    tree.tiles.toggle_visibility(children[child_idx]);
+                }
+            }
+
+            // Remove some tiles:
+            for _ in 0..rng.rand_u64() % 2 {
+                let children =
+                    if let Some(Tile::Container(Container::Grid(grid))) = tree.tiles.get(root) {
+                        grid.visible_children_and_holes(&tree.tiles)
+                            .iter()
+                            .copied()
+                            .flatten()
+                            .collect_vec()
+                    } else {
+                        panic!()
+                    };
+
+                if !children.is_empty() {
+                    let child_id = children[rng.rand_usize() % children.len()];
+                    let (parent, _) = tree.remove_tile_id_from_parent(child_id).unwrap();
+                    assert_eq!(parent, root);
+                    tree.tiles.remove(child_id).unwrap();
+                }
+            }
+        }
+    }
+
+    // We want a simple RNG, but don't want to pull in any deps just for a test.
+    // Code from adapted from https://docs.rs/nanorand/latest/src/nanorand/rand/pcg64.rs.html#15-19
+    pub struct Pcg64 {
+        seed: u128,
+        state: u128,
+        inc: u128,
+    }
+
+    impl Pcg64 {
+        pub const fn new_seed(seed: u128) -> Self {
+            Self {
+                seed,
+                inc: 0,
+                state: 0,
+            }
+        }
+
+        fn step(&mut self) {
+            const PCG_DEFAULT_MULTIPLIER_128: u128 = 47026247687942121848144207491837523525;
+
+            self.state = self
+                .state
+                .wrapping_mul(PCG_DEFAULT_MULTIPLIER_128)
+                .wrapping_add(self.inc);
+        }
+
+        fn rand_u64(&mut self) -> u64 {
+            self.state = 0;
+            self.inc = self.seed.wrapping_shl(1) | 1;
+            self.step();
+            self.state = self.state.wrapping_add(self.seed);
+            self.step();
+            self.step();
+            self.state.wrapping_shr(64) as u64 ^ self.state as u64
+        }
+
+        fn rand_usize(&mut self) -> usize {
+            self.rand_u64() as usize
+        }
+    }
+}
diff --git a/src/tiles.rs b/src/tiles.rs
index 29089b7..03fefb3 100644
--- a/src/tiles.rs
+++ b/src/tiles.rs
@@ -72,6 +72,17 @@ impl<Pane> Tiles<Pane> {
         rect.unwrap_or(egui::Rect::from_min_max(Pos2::ZERO, Pos2::ZERO))
     }
 
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.tiles.is_empty()
+    }
+
+    /// The number of tiles, including invisible tiles.
+    #[inline]
+    pub fn len(&self) -> usize {
+        self.tiles.len()
+    }
+
     pub fn get(&self, tile_id: TileId) -> Option<&Tile<Pane>> {
         self.tiles.get(&tile_id)
     }
@@ -123,6 +134,10 @@ impl<Pane> Tiles<Pane> {
         }
     }
 
+    pub fn toggle_visibility(&mut self, tile_id: TileId) {
+        self.set_visible(tile_id, !self.is_visible(tile_id));
+    }
+
     pub fn insert(&mut self, id: TileId, tile: Tile<Pane>) {
         self.tiles.insert(id, tile);
     }