diff --git a/source/WaypointManager/WaypointManager.cs b/source/WaypointManager/WaypointManager.cs
index 1b0f222..c7671c5 100644
--- a/source/WaypointManager/WaypointManager.cs
+++ b/source/WaypointManager/WaypointManager.cs
@@ -106,6 +106,11 @@ private void LoadTextures()
 
         private void SetupToolbar()
         {
+            if (HighLogic.LoadedScene == GameScenes.MAINMENU)
+            {
+                return;
+            }
+
             if (launcherButton == null && Config.useStockToolbar)
             {
                 ApplicationLauncher.AppScenes visibleScenes = ApplicationLauncher.AppScenes.FLIGHT |
@@ -152,6 +157,11 @@ private void UnloadToolbar()
         private void OnGameSceneLoad(GameScenes scene)
         {
             WaypointData.CacheWaypointData();
+            if (scene == GameScenes.MAINMENU)
+            {
+                TeardownToolbar(scene);
+            }
+
             if (scene != GameScenes.FLIGHT && scene != GameScenes.TRACKSTATION)
             {
                 showGUI = false;