diff --git a/client/src/map/map.ts b/client/src/map/map.ts
index 494b9ca7..fd8745f4 100644
--- a/client/src/map/map.ts
+++ b/client/src/map/map.ts
@@ -812,17 +812,6 @@ export class Map extends L.Map {
         
         this.#olympusApp = olympusApp;
 
-
-        //  Bit crappy until we move to a more structured set of code
-
-        let controlTipsBoolean = this.getOlympusApp().getFeatureSwitches().getSwitch( "controlTips" )?.isEnabled();
-
-        controlTipsBoolean = ( typeof controlTipsBoolean === "boolean" ) ? controlTipsBoolean : true;
-
-        this.#visibilityOptions[SHOW_CONTROL_TIPS] = controlTipsBoolean;
-
-        document.dispatchEvent(new CustomEvent("mapVisibilityOptionsChanged"));
-
     }
 }
 
diff --git a/client/src/shortcut/controltips.ts b/client/src/shortcut/controltips.ts
index 25cff7bf..a31ef77b 100644
--- a/client/src/shortcut/controltips.ts
+++ b/client/src/shortcut/controltips.ts
@@ -186,6 +186,13 @@ export class ControlTips {
                         "showIfHoveringOverAirbase": false,
                         "showIfUnitSelected": true,
                         "unitsMustBeControlled": true
+                    },
+                    {
+                        "key": `Mouse2`,
+                        "action": `Airbase menu`,
+                        "showIfHoveringOverAirbase": true,
+                        "showIfUnitSelected": true,
+                        "unitsMustBeControlled": true
                     }
                 ]
             },