diff --git a/src/logic/Windows.swift b/src/logic/Windows.swift
index 3aea5b9b..9e3c0aa6 100644
--- a/src/logic/Windows.swift
+++ b/src/logic/Windows.swift
@@ -24,6 +24,7 @@ class Windows {
     }
 
     static func windowIndexAfterCycling(_ step: Int) -> Int {
+        if list.count == 0 { return 0 }
         var iterations = 0
         var targetIndex = focusedWindowIndex
         repeat {