diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index 5740ef984..14990bfcd 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -1246,12 +1246,12 @@ void CheckTrackerWindow::DrawElement() {
 
         ImGui::EndTable(); // Checks Lead-out
         ImGui::EndTable(); // Quick Options Lead-out
-        Trackers::EndFloatWindows();
         if (doingCollapseOrExpand) {
             optCollapseAll = false;
             optExpandAll = false;
         }
     }
+    Trackers::EndFloatWindows();
 }
 
 bool UpdateFilters() {
diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
index 3277370ba..460b2831a 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
@@ -1067,8 +1067,8 @@ void EntranceTrackerWindow::DrawElement() {
             }
         }
         ImGui::EndChild();
-        Trackers::EndFloatWindows();
     }
+    Trackers::EndFloatWindows();
 }
 
 void EntranceTrackerWindow::InitElement() {