diff --git a/ShiftOS.Frontend/GUI/Control.cs b/ShiftOS.Frontend/GUI/Control.cs
index b78f032..4d05470 100644
--- a/ShiftOS.Frontend/GUI/Control.cs
+++ b/ShiftOS.Frontend/GUI/Control.cs
@@ -240,6 +240,7 @@ namespace ShiftOS.Frontend.GUI
                 ctrl._parent = this;
                 _children.Add(ctrl);
                 Invalidate();
+                UIManager.FocusedControl = ctrl;
             }
         }
 
diff --git a/ShiftOS.Frontend/GraphicsSubsystem/UIManager.cs b/ShiftOS.Frontend/GraphicsSubsystem/UIManager.cs
index d16685b..4ec1292 100644
--- a/ShiftOS.Frontend/GraphicsSubsystem/UIManager.cs
+++ b/ShiftOS.Frontend/GraphicsSubsystem/UIManager.cs
@@ -135,7 +135,7 @@ namespace ShiftOS.Frontend.GraphicsSubsystem
         {
             if (!topLevels.Contains(ctrl))
                 topLevels.Add(ctrl);
-
+            FocusedControl = ctrl;
         }
 
         public static void InvalidateAll()