diff --git a/ToolbarControl/BlizzyOptions.cs b/ToolbarControl/BlizzyOptions.cs
index c2fb7cb..7927fdf 100644
--- a/ToolbarControl/BlizzyOptions.cs
+++ b/ToolbarControl/BlizzyOptions.cs
@@ -180,7 +180,7 @@ void DoWindow(int id)
 
                     doUseButtons = true;
                 }
-                if (!ToolbarControl.registeredMods[mod.modId].noneAllowed)
+                if (!ToolbarControl.registeredMods[mod.modId].noneAllowed && !HighLogic.CurrentGame.Parameters.CustomParams<TC>().allowAllToolbarButtonsHidden)
                     GUI.enabled = false;
                 bool none = (!stock & !blizzy);
                 bool newnone = GUILayout.Toggle(none, "", GUILayout.Width(25));
diff --git a/ToolbarControl/ToolbarControl.cs b/ToolbarControl/ToolbarControl.cs
index 157c57d..fde0589 100644
--- a/ToolbarControl/ToolbarControl.cs
+++ b/ToolbarControl/ToolbarControl.cs
@@ -459,8 +459,11 @@ private void SetBlizzySettings()
         {
             if (!ToolbarManager.ToolbarAvailable)
             {
-                this.stockActive = true;
-                SetStockSettings();
+                if (this.blizzyActive)
+                {
+                    this.stockActive = true;
+                    SetStockSettings();
+                }
                 return;
             }
             if (!this.stockActive)