diff --git a/FanControl/FanControlForm.Designer.cs b/FanControl/FanControlForm.Designer.cs
index 9b71b4a..95bc48a 100644
--- a/FanControl/FanControlForm.Designer.cs
+++ b/FanControl/FanControlForm.Designer.cs
@@ -82,8 +82,8 @@ namespace FanControl
             this.toolStripMenuItem2,
             this.toolStripSeparator3,
             this.toolStripSeparatorEndOfModes,
-            this.toolStripMenuItemStartupOnBootContext,
             this.toolStripMenuItemAlwaysOnTopContext,
+            this.toolStripMenuItemStartupOnBootContext,
             this.toolStripMenuItem3,
             this.toolStripMenuItem5,
             this.toolStripSeparator1,
@@ -106,7 +106,13 @@ namespace FanControl
             // toolStripSeparatorEndOfModes
             // 
             this.toolStripSeparatorEndOfModes.Name = "toolStripSeparatorEndOfModes";
-            this.toolStripSeparatorEndOfModes.Size = new System.Drawing.Size(207, 6);
+            this.toolStripSeparatorEndOfModes.Size = new System.Drawing.Size(207, 6);            // 
+            // toolStripMenuItemAlwaysOnTopContext
+            // 
+            this.toolStripMenuItemAlwaysOnTopContext.Name = "toolStripMenuItemAlwaysOnTopContext";
+            this.toolStripMenuItemAlwaysOnTopContext.Size = new System.Drawing.Size(210, 24);
+            this.toolStripMenuItemAlwaysOnTopContext.Text = "&Always on Top";
+            this.toolStripMenuItemAlwaysOnTopContext.Click += new System.EventHandler(this.toolStripMenuItemAlwaysOnTop_Click);
             // 
             // toolStripMenuItemStartupOnBootContext
             // 
@@ -115,13 +121,6 @@ namespace FanControl
             this.toolStripMenuItemStartupOnBootContext.Text = "Run On &Startup";
             this.toolStripMenuItemStartupOnBootContext.Click += new System.EventHandler(this.toolStripMenuItemStartupOnBoot_Click);
             // 
-            // toolStripMenuItemAlwaysOnTopContext
-            // 
-            this.toolStripMenuItemAlwaysOnTopContext.Name = "toolStripMenuItemAlwaysOnTopContext";
-            this.toolStripMenuItemAlwaysOnTopContext.Size = new System.Drawing.Size(210, 24);
-            this.toolStripMenuItemAlwaysOnTopContext.Text = "&Always on Top";
-            this.toolStripMenuItemAlwaysOnTopContext.Click += new System.EventHandler(this.toolStripMenuItemAlwaysOnTop_Click);
-            // 
             // toolStripMenuItem3
             // 
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
@@ -165,8 +164,8 @@ namespace FanControl
             // controlToolStripMenuItem
             // 
             this.controlToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripMenuItemStartupOnBoot,
             this.toolStripMenuItemAlwaysOnTop,
+            this.toolStripMenuItemStartupOnBoot,
             this.toolStripMenuItem4,
             this.toolStripSeparator2,
             this.exitToolStripMenuItem});
@@ -174,13 +173,6 @@ namespace FanControl
             this.controlToolStripMenuItem.Size = new System.Drawing.Size(72, 28);
             this.controlToolStripMenuItem.Text = "&Control";
             // 
-            // toolStripMenuItemStartupOnBoot
-            // 
-            this.toolStripMenuItemStartupOnBoot.Name = "toolStripMenuItemStartupOnBoot";
-            this.toolStripMenuItemStartupOnBoot.Size = new System.Drawing.Size(192, 26);
-            this.toolStripMenuItemStartupOnBoot.Text = "Run On &Startup";
-            this.toolStripMenuItemStartupOnBoot.Click += new System.EventHandler(this.toolStripMenuItemStartupOnBoot_Click);
-            // 
             // toolStripMenuItemAlwaysOnTop
             // 
             this.toolStripMenuItemAlwaysOnTop.Name = "toolStripMenuItemAlwaysOnTop";
@@ -188,6 +180,13 @@ namespace FanControl
             this.toolStripMenuItemAlwaysOnTop.Text = "&Always on Top";
             this.toolStripMenuItemAlwaysOnTop.Click += new System.EventHandler(this.toolStripMenuItemAlwaysOnTop_Click);
             // 
+            // toolStripMenuItemStartupOnBoot
+            // 
+            this.toolStripMenuItemStartupOnBoot.Name = "toolStripMenuItemStartupOnBoot";
+            this.toolStripMenuItemStartupOnBoot.Size = new System.Drawing.Size(192, 26);
+            this.toolStripMenuItemStartupOnBoot.Text = "Run On &Startup";
+            this.toolStripMenuItemStartupOnBoot.Click += new System.EventHandler(this.toolStripMenuItemStartupOnBoot_Click);
+            // 
             // toolStripMenuItem4
             // 
             this.toolStripMenuItem4.Name = "toolStripMenuItem4";
diff --git a/PerformanceOverlay/Controller.cs b/PerformanceOverlay/Controller.cs
index 53cfdc4..6f247e4 100644
--- a/PerformanceOverlay/Controller.cs
+++ b/PerformanceOverlay/Controller.cs
@@ -65,6 +65,8 @@ namespace PerformanceOverlay
             contextMenu.Opening += delegate { kernelDriversItem.Checked = Instance.UseKernelDrivers; };
             contextMenu.Items.Add(kernelDriversItem);
 
+            contextMenu.Items.Add(new ToolStripSeparator());
+
             if (startupManager.IsAvailable)
             {
                 var startupItem = new ToolStripMenuItem("Run On Startup");
diff --git a/SteamController/Controller.cs b/SteamController/Controller.cs
index b5a10b2..a45cded 100644
--- a/SteamController/Controller.cs
+++ b/SteamController/Controller.cs
@@ -84,6 +84,14 @@ namespace SteamController
 
             AddSteamOptions(contextMenu);
 
+            var settingsItem = contextMenu.Items.Add("&Settings");
+            settingsItem.Click += Settings_Click;
+
+            var shortcutsItem = contextMenu.Items.Add("&Shortcuts");
+            shortcutsItem.Click += delegate { Process.Start("explorer.exe", "https://steam-deck-tools.ayufan.dev/shortcuts.html"); };
+
+            contextMenu.Items.Add(new ToolStripSeparator());
+
             if (startupManager.IsAvailable)
             {
                 var startupItem = new ToolStripMenuItem("Run On Startup");
@@ -92,17 +100,9 @@ namespace SteamController
                 contextMenu.Items.Add(startupItem);
             }
 
-            var settingsItem = contextMenu.Items.Add("&Settings");
-            settingsItem.Click += Settings_Click;
-
-            contextMenu.Items.Add(new ToolStripSeparator());
-
             var checkForUpdatesItem = contextMenu.Items.Add("&Check for Updates");
             checkForUpdatesItem.Click += delegate { Instance.RunUpdater(TitleWithVersion, true); };
 
-            var shortcutsItem = contextMenu.Items.Add("&Shortcuts");
-            shortcutsItem.Click += delegate { Process.Start("explorer.exe", "https://steam-deck-tools.ayufan.dev/shortcuts.html"); };
-
             var helpItem = contextMenu.Items.Add("&Help");
             helpItem.Click += delegate { Process.Start("explorer.exe", "https://steam-deck-tools.ayufan.dev"); };