1 files changed, 3 insertions, 2 deletions
diff --git a/src/layout.rs b/src/layout.rs
index 47a7a4b9..cd8ea9b0 100644
--- a/src/layout.rs
+++ b/src/layout.rs
@@ -886,14 +886,15 @@ impl<W: LayoutElement> MonitorSet<W> {
             }
         };
 
-        assert!(primary_idx <= monitors.len());
-        assert!(active_monitor_idx <= monitors.len());
+        assert!(primary_idx < monitors.len());
+        assert!(active_monitor_idx < monitors.len());
 
         for (idx, monitor) in monitors.iter().enumerate() {
             assert!(
                 !monitor.workspaces.is_empty(),
                 "monitor monitor must have at least one workspace"
             );
+            assert!(monitor.active_workspace_idx < monitor.workspaces.len());
 
             let monitor_id = OutputId::new(&monitor.output);