diff --git a/dvmconsole/MainWindow.xaml b/dvmconsole/MainWindow.xaml
index 4f05d29..114ee68 100644
--- a/dvmconsole/MainWindow.xaml
+++ b/dvmconsole/MainWindow.xaml
@@ -53,7 +53,8 @@
                 <MenuItem Header="_Lock Widgets" IsCheckable="True" Checked="ToggleLockWidgets_Click" Unchecked="ToggleLockWidgets_Click" x:Name="menuToggleLockWidgets" />
                 <MenuItem Header="_Fit Channel Display to Window Size" Click="ResizeCanvasToWindow_Click" x:Name="menuFitToWindow" />
                 <MenuItem Header="_Snap Call History To Window" IsCheckable="True" Checked="ToggleSnapCallHistory_Click" Unchecked="ToggleSnapCallHistory_Click" x:Name="menuSnapCallHistory" />
-                <MenuItem Header="_Stay on Top" IsCheckable="True" Checked="ToggleStayOnTop_Click" Unchecked="ToggleStayOnTop_Click" x:Name="menuStayOnTop" />
+                <Separator />
+                <MenuItem Header="_Always on Top" IsCheckable="True" Checked="ToggleKeepWindowOnTop_Click" Unchecked="ToggleKeepWindowOnTop_Click" x:Name="menuKeepWindowOnTop" />
             </MenuItem>
         </Menu>
 
diff --git a/dvmconsole/MainWindow.xaml.cs b/dvmconsole/MainWindow.xaml.cs
index 9621c3d..7986489 100644
--- a/dvmconsole/MainWindow.xaml.cs
+++ b/dvmconsole/MainWindow.xaml.cs
@@ -1118,7 +1118,7 @@ namespace dvmconsole
             menuToggleLockWidgets.IsChecked = settingsManager.LockWidgets;
             menuSnapCallHistory.IsChecked = settingsManager.SnapCallHistoryToWindow;
             menuTogglePTTMode.IsChecked = settingsManager.TogglePTTMode;
-            menuStayOnTop.IsChecked = settingsManager.KeepWindowOnTop;
+            menuKeepWindowOnTop.IsChecked = settingsManager.KeepWindowOnTop;
 
             if (!string.IsNullOrEmpty(settingsManager.LastCodeplugPath) && File.Exists(settingsManager.LastCodeplugPath))
                 LoadCodeplug(settingsManager.LastCodeplugPath);
@@ -1620,11 +1620,14 @@ namespace dvmconsole
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void ToggleStayOnTop_Click(object sender, RoutedEventArgs e)
+        private void ToggleKeepWindowOnTop_Click(object sender, RoutedEventArgs e)
         {
             this.Topmost = !this.Topmost;
 
-            settingsManager.KeepWindowOnTop = menuStayOnTop.IsChecked;
+            if (!windowLoaded)
+                return;
+
+            settingsManager.KeepWindowOnTop = !settingsManager.KeepWindowOnTop;
         }
 
         /// <summary>