diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp
index 8773b3dc30..f69a50ab42 100644
--- a/src/openrct2/interface/Window.cpp
+++ b/src/openrct2/interface/Window.cpp
@@ -83,8 +83,9 @@ static constexpr float kWindowScrollLocations[][2] = {
 
     void WindowVisitEach(std::function<void(WindowBase*)> func)
     {
-        for (auto& w : gWindowList)
+        for (size_t i = 0; i < gWindowList.size(); i++)
         {
+            auto& w = gWindowList[i];
             if (w->flags.has(WindowFlag::dead))
                 continue;
             func(w.get());