diff --git a/src/openrct2-ui/windows/TitleScenarioSelect.cpp b/src/openrct2-ui/windows/TitleScenarioSelect.cpp
index f5aa6da9bf..75f972cfd8 100644
--- a/src/openrct2-ui/windows/TitleScenarioSelect.cpp
+++ b/src/openrct2-ui/windows/TitleScenarioSelect.cpp
@@ -681,16 +681,16 @@ static void initialise_list_items(rct_window *w)
             _listItems.pop_back();
 
             // Remove empty headings
-            for (size_t i = 0; i < _listItems.size(); i++)
+            for (auto it = _listItems.begin(); it != _listItems.end(); it++)
             {
-                const auto &listItem = _listItems[i];
+                const auto &listItem = *it;
                 if (listItem.type == LIST_ITEM_TYPE::HEADING)
                 {
-                    if (i + 1 == _listItems.size() ||
-                        _listItems[i + 1].type == LIST_ITEM_TYPE::HEADING)
+                    if ((it + 1) == _listItems.end() ||
+                        (it + 1)->type == LIST_ITEM_TYPE::HEADING)
                     {
-                        _listItems.erase(_listItems.begin() + i);
-                        i--;
+                        it = _listItems.erase(it);
+                        it--;
                     }
                 }
             }