diff --git a/Barotrauma/BarotraumaClient/Source/GameSettings.cs b/Barotrauma/BarotraumaClient/Source/GameSettings.cs
index 75818069f..2b899ab9d 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSettings.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSettings.cs
@@ -448,20 +448,11 @@ namespace Barotrauma
             GraphicsWidth = mode.Width;
             GraphicsHeight = mode.Height;
 
-
-            //GameMain.Graphics.PreferredBackBufferWidth = GraphicsWidth;
-            //GameMain.Graphics.PreferredBackBufferHeight = GraphicsHeight;
-            //GameMain.Graphics.ApplyChanges();
-
-            //CoroutineManager.StartCoroutine(GameMain.Instance.Load());
-
             UnsavedSettings = true;
 
             return true;
         }
 
-
-
         private IEnumerable<object> WaitForKeyPress(GUITextBox keyBox)
         {
             yield return CoroutineStatus.Running;
@@ -483,7 +474,7 @@ namespace Barotrauma
                 keyMapping[keyIndex] = new KeyOrMouse(0);
                 keyBox.Text = "Mouse1";
             }
-            else if (PlayerInput.LeftButtonClicked())
+            else if (PlayerInput.RightButtonClicked())
             {
                 keyMapping[keyIndex] = new KeyOrMouse(1);
                 keyBox.Text = "Mouse2";