diff --git a/ClassicalSharp/2D/Widgets/HotbarWidget.cs b/ClassicalSharp/2D/Widgets/HotbarWidget.cs
index cac853993..0623378a0 100644
--- a/ClassicalSharp/2D/Widgets/HotbarWidget.cs
+++ b/ClassicalSharp/2D/Widgets/HotbarWidget.cs
@@ -103,7 +103,7 @@ namespace ClassicalSharp.Gui.Widgets {
 			if (key >= Key.Number1 && key <= Key.Number9) {
 				int index = (int)key - (int)Key.Number1;
 				
-				if (game.Input.AltDown) {
+				if (game.IsKeyDown(KeyBind.HotbarSwitching)) {
 					// Pick from first to ninth row
 					game.Inventory.Offset = index * Inventory.BlocksPerRow;
 					altHandled = true;
@@ -120,7 +120,7 @@ namespace ClassicalSharp.Gui.Widgets {
 			// a) user presses alt then number
 			// b) user presses alt
 			// thus we only do case b) if case a) did not happen
-			if (!(key == game.Input.Keys[KeyBind.HotbarSwitching])) return false;			
+			if (key != game.Input.Keys[KeyBind.HotbarSwitching]) return false;
 			if (altHandled) { altHandled = false; return true; } // handled already
 			
 			// Alternate between first and second row
diff --git a/ClassicalSharp/Game/KeyMap.cs b/ClassicalSharp/Game/KeyMap.cs
index 80bc6d56f..9ed1a4a9b 100644
--- a/ClassicalSharp/Game/KeyMap.cs
+++ b/ClassicalSharp/Game/KeyMap.cs
@@ -10,8 +10,9 @@ namespace ClassicalSharp {
 		Forward, Back, Left, Right, Jump, Respawn, SetSpawn, Chat,
 		Inventory, ToggleFog, SendChat, PauseOrExit, PlayerList,
 		Speed, NoClip, Fly, FlyUp, FlyDown, ExtInput, HideFps,
-		HotbarSwitching, Screenshot, Fullscreen, ThirdPerson, HideGui, AxisLines,
-		ZoomScrolling, HalfSpeed, MouseLeft, MouseMiddle, MouseRight, Autorotate
+		Screenshot, Fullscreen, ThirdPerson, HideGui, AxisLines,
+		ZoomScrolling, HalfSpeed, MouseLeft, MouseMiddle, MouseRight, 
+		Autorotate, HotbarSwitching
 #pragma warning restore 1591
 	}
 	
@@ -41,9 +42,11 @@ namespace ClassicalSharp {
 			keys[11] = Key.Escape; keys[12] = Key.Tab; keys[13] = Key.ShiftLeft;
 			keys[14] = Key.X; keys[15] = Key.Z; keys[16] = Key.Q;
 			keys[17] = Key.E; keys[18] = Key.AltLeft; keys[19] = Key.F3;
-			keys[20] = Key.AltLeft; keys[21] = Key.F12; keys[22] = Key.F11; keys[23] = Key.F5;
-			keys[24] = Key.F1; keys[25] = Key.F7; keys[26] = Key.C; keys[27] = Key.ControlLeft;
-			keys[28] = Key.Unknown; keys[29] = Key.Unknown; keys[30] = Key.Unknown;  keys[31] = Key.F6;
+			keys[20] = Key.F12; keys[21] = Key.F11; keys[22] = Key.F5;
+ 			keys[23] = Key.F1; keys[24] = Key.F7; keys[25] = Key.C;
+			keys[26] = Key.ControlLeft; 
+			keys[27] = Key.Unknown; keys[28] = Key.Unknown; keys[29] = Key.Unknown;
+			keys[30] = Key.F6; keys[31] = Key.AltLeft;
 			
 			defaultKeys = new Key[keys.Length];
 			for (int i = 0; i < defaultKeys.Length; i++)