diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 1eb387ee..9d92b849 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -2,8 +2,9 @@
 
 Features/Enhancements:
 ----------------------
-#942: Improved Russian translation of several items
 #948: Fixed issue where many menu item translations were not being used
+#942: Improved Russian translation of several items
+#902: Menu bar can once again be moved. View -> "Lock toolbar positions" now also locks the menu position
 
 Fixes:
 ------
diff --git a/mRemoteV1/UI/Forms/frmMain.Designer.cs b/mRemoteV1/UI/Forms/frmMain.Designer.cs
index b6f861f0..b2585b95 100644
--- a/mRemoteV1/UI/Forms/frmMain.Designer.cs
+++ b/mRemoteV1/UI/Forms/frmMain.Designer.cs
@@ -65,6 +65,7 @@ namespace mRemoteNG.UI.Forms
             this.msMain.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.msMain.Dock = System.Windows.Forms.DockStyle.None;
             this.msMain.GripMargin = new System.Windows.Forms.Padding(0);
+            this.msMain.GripStyle = System.Windows.Forms.ToolStripGripStyle.Visible;
             this.msMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.fileMenu,
             this.viewMenu,
@@ -78,7 +79,7 @@ namespace mRemoteNG.UI.Forms
             this.msMain.TabIndex = 0;
             this.msMain.Text = "Main Toolbar";
             // 
-            // mainFileMenu1
+            // fileMenu
             // 
             this.fileMenu.ConnectionInitiator = null;
             this.fileMenu.Name = "mMenFile";
@@ -87,7 +88,7 @@ namespace mRemoteNG.UI.Forms
             this.fileMenu.TreeWindow = null;
             this.fileMenu.DropDownOpening += new System.EventHandler(this.mainFileMenu1_DropDownOpening);
             // 
-            // viewMenu1
+            // viewMenu
             // 
             this.viewMenu.FullscreenHandler = null;
             this.viewMenu.MainForm = null;
@@ -99,7 +100,7 @@ namespace mRemoteNG.UI.Forms
             this.viewMenu.TsQuickConnect = null;
             this.viewMenu.DropDownOpening += new System.EventHandler(this.ViewMenu_Opening);
             // 
-            // toolsMenu1
+            // toolsMenu
             // 
             this.toolsMenu.CredentialProviderCatalog = null;
             this.toolsMenu.MainForm = null;
@@ -107,7 +108,7 @@ namespace mRemoteNG.UI.Forms
             this.toolsMenu.Size = new System.Drawing.Size(47, 20);
             this.toolsMenu.Text = "&Tools";
             // 
-            // helpMenu1
+            // helpMenu
             // 
             this.helpMenu.Name = "mMenInfo";
             this.helpMenu.Size = new System.Drawing.Size(44, 20);
diff --git a/mRemoteV1/UI/Forms/frmMain.cs b/mRemoteV1/UI/Forms/frmMain.cs
index 61677d0c..372fa8e4 100644
--- a/mRemoteV1/UI/Forms/frmMain.cs
+++ b/mRemoteV1/UI/Forms/frmMain.cs
@@ -197,7 +197,7 @@ namespace mRemoteNG.UI.Forms
 
 	    private void LockToolbarPositions(bool shouldBeLocked)
 	    {
-		    var toolbars = new ToolStrip[] { _quickConnectToolStrip, _multiSshToolStrip, _externalToolsToolStrip };
+		    var toolbars = new ToolStrip[] { _quickConnectToolStrip, _multiSshToolStrip, _externalToolsToolStrip, msMain };
 			foreach (var toolbar in toolbars)
 			{
 				toolbar.GripStyle = shouldBeLocked