diff --git a/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs
index a7356190e2..640e1b79c8 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs
@@ -53,6 +53,11 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 				objectivesButton.IsVisible = () => world.LocalPlayer != null;
 			}
 
+			var moneybin = gameRoot.Get("INGAME_MONEY_BIN");
+			moneybin.Get<OrderButtonWidget>("SELL").Key = Game.Settings.Keys.SellKey;
+			moneybin.Get<OrderButtonWidget>("POWER_DOWN").Key = Game.Settings.Keys.PowerDownKey;
+			moneybin.Get<OrderButtonWidget>("REPAIR").Key = Game.Settings.Keys.RepairKey;
+
 			optionsBG.Get<ButtonWidget>("DISCONNECT").OnClick = () => LeaveGame(optionsBG, world);
 
 			optionsBG.Get<ButtonWidget>("SETTINGS").OnClick = () => Ui.OpenWindow("SETTINGS_MENU");
diff --git a/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
index 907f21b5cb..c98b86a752 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
@@ -41,6 +41,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			{
 				w.Pressed = () => world.OrderGenerator is T;
 				w.OnMouseDown = mi => world.ToggleInputMode<T>();
+				w.OnKeyPress = ki => world.ToggleInputMode<T>();
 			}
 		}
 	}
diff --git a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
index 7e181fb528..32e3b65e4e 100644
--- a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
@@ -53,15 +53,6 @@ namespace OpenRA.Mods.RA.Widgets
 				if (e.KeyName == Game.Settings.Keys.ToSelectionKey)
 					return ToSelection();
 
-				if (e.KeyName == Game.Settings.Keys.SellKey)
-					return PerformSwitchToSellMode();
-
-				if (e.KeyName == Game.Settings.Keys.PowerDownKey)
-					return PerformSwitchToPowerDownMode();
-
-				if (e.KeyName == Game.Settings.Keys.RepairKey)
-					return PerformSwitchToRepairMode();
-
 				if (!World.Selection.Actors.Any()) // Put all functions, that are no unit-functions, before this line!
 					return false;
 
@@ -196,23 +187,5 @@ namespace OpenRA.Mods.RA.Widgets
 			Game.viewport.Center(World.Selection.Actors);
 			return true;
 		}
-
-		bool PerformSwitchToSellMode()
-		{
-			World.ToggleInputMode<SellOrderGenerator>();
-			return true;
-		}
-
-		bool PerformSwitchToPowerDownMode()
-		{
-			World.ToggleInputMode<PowerDownOrderGenerator>();
-			return true;
-		}
-
-		bool PerformSwitchToRepairMode()
-		{
-			World.ToggleInputMode<RepairOrderGenerator>();
-			return true;
-		}
 	}
 }