diff --git a/src/MicroEngineer/MicroEngineerPlugin.cs b/src/MicroEngineer/MicroEngineerPlugin.cs
index 4c52661..8a76f82 100644
--- a/src/MicroEngineer/MicroEngineerPlugin.cs
+++ b/src/MicroEngineer/MicroEngineerPlugin.cs
@@ -31,7 +31,6 @@ public class MicroEngineerPlugin : BaseSpaceWarpPlugin
     // AppBar button IDs
     internal const string ToolbarFlightButtonID = "BTN-MicroEngineerFlight";
     internal const string ToolbarOabButtonID = "BTN-MicroEngineerOAB";
-    internal const string ToolbarKscButtonID = "BTN-MicroEngineerKSC";
     
     public Coroutine MainUpdateLoop;
 
diff --git a/src/MicroEngineer/UI/MainGuiController.cs b/src/MicroEngineer/UI/MainGuiController.cs
index 6f21d53..9f91565 100644
--- a/src/MicroEngineer/UI/MainGuiController.cs
+++ b/src/MicroEngineer/UI/MainGuiController.cs
@@ -78,7 +78,7 @@ private void OnCloseButton(ClickEvent evt)
 
             Utility.SaveLayout();
             FlightSceneController.Instance.ShowGui = false;
-            GameObject.Find("BTN-MicroEngineerBtn")?.GetComponent<UIValue_WriteBool_Toggle>()?.SetValue(false);
+            GameObject.Find(MicroEngineerPlugin.ToolbarFlightButtonID)!.GetComponent<UIValue_WriteBool_Toggle>()!.SetValue(false);
         }
 
         private void OnMinimizeButton(ClickEvent evt)
diff --git a/src/MicroEngineer/UI/StageInfoOABController.cs b/src/MicroEngineer/UI/StageInfoOABController.cs
index 45e8f98..0dc151b 100644
--- a/src/MicroEngineer/UI/StageInfoOABController.cs
+++ b/src/MicroEngineer/UI/StageInfoOABController.cs
@@ -1,4 +1,5 @@
 using BepInEx.Logging;
+using KSP.UI.Binding;
 using MicroEngineer.Entries;
 using MicroEngineer.Managers;
 using MicroEngineer.Utilities;
@@ -207,6 +208,7 @@ private void OnCloseButton(ClickEvent evt)
             StageInfoOABWindow.IsEditorActive = false;
             Utility.SaveLayout();
             OABSceneController.Instance.ShowGui = false;
+            GameObject.Find(MicroEngineerPlugin.ToolbarOabButtonID)!.GetComponent<UIValue_WriteBool_Toggle>()!.SetValue(false);
         }
         
         public void InitializeControl(BaseEntryControl control, BaseEntry entry, bool subscribeToValueChanges = true)