diff --git a/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp b/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp
index cb238d87e6a..6f3b863bfac 100644
--- a/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp
@@ -1043,11 +1043,11 @@ static void DriverStationExecute() {
 
   bool disableDS = IsDSDisabled();
   if (disableDS && !prevDisableDS) {
-    if (auto win = HALSimGui::manager->GetWindow("System Joysticks")) {
+    if (auto win = DriverStationGui::dsManager->GetWindow("System Joysticks")) {
       win->SetVisibility(glass::Window::kDisabled);
     }
   } else if (!disableDS && prevDisableDS) {
-    if (auto win = HALSimGui::manager->GetWindow("System Joysticks")) {
+    if (auto win = DriverStationGui::dsManager->GetWindow("System Joysticks")) {
       win->SetVisibility(glass::Window::kShow);
     }
   }