diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs
index d50be53..cd74a6b 100644
--- a/ShiftOS.WinForms/WinformsDesktop.cs
+++ b/ShiftOS.WinForms/WinformsDesktop.cs
@@ -58,6 +58,11 @@ namespace ShiftOS.WinForms
         public WinformsDesktop()
         {
             InitializeComponent();
+            this.Click += (o, a) =>
+            {
+                HideAppLauncher();
+            };
+            SetupControl(desktoppanel);
             Shiftorium.Installed += () =>
             {
                 //Only if the DevX Legions story hasn't been experienced yet.
@@ -284,6 +289,7 @@ namespace ShiftOS.WinForms
                                             form.BringToFront();
                                             focused = form;
                                         }
+                                        HideAppLauncher();
                                     };
 
                                     var pnlbtn = new Panel();
@@ -826,6 +832,13 @@ namespace ShiftOS.WinForms
         {
         }
 
+        public void SetupControl(Control ctrl)
+        {
+            foreach (Control c in ctrl.Controls)
+                SetupControl(c);
+            ctrl.Click += (o, a) => HideAppLauncher();
+        }
+
         private void apps_Click(object sender, EventArgs e)
         {
             if (Shiftorium.UpgradeInstalled("advanced_app_launcher"))