diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs
index b961612561..cedab28475 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs
@@ -123,6 +123,9 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 			BindOrderButton<SellOrderGenerator>(world, sidebarRoot, "SELL_BUTTON", "sell");
 			BindOrderButton<RepairOrderGenerator>(world, sidebarRoot, "REPAIR_BUTTON", "repair");
 
+			sidebarRoot.Get<ToggleButtonWidget>("SELL_BUTTON").Key = Game.Settings.Keys.SellKey;
+			sidebarRoot.Get<ToggleButtonWidget>("REPAIR_BUTTON").Key = Game.Settings.Keys.RepairKey;
+
 			var powerManager = world.LocalPlayer.PlayerActor.Trait<PowerManager>();
 			var playerResources = world.LocalPlayer.PlayerActor.Trait<PlayerResources>();
 			sidebarRoot.Get<LabelWidget>("CASH").GetText = () =>
diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml
index 779d911eed..21d839f3b0 100644
--- a/mods/cnc/chrome/ingame.yaml
+++ b/mods/cnc/chrome/ingame.yaml
@@ -112,7 +112,6 @@ Container@PLAYER_WIDGETS:
 							ImageCollection:order-icons
 							ImageName:options
 				ToggleButton@SELL_BUTTON:
-					Key: [
 					X:82
 					Y:0-24
 					Width:30
@@ -126,7 +125,6 @@ Container@PLAYER_WIDGETS:
 							Y:5
 							ImageCollection:order-icons
 				ToggleButton@REPAIR_BUTTON:
-					Key: ]
 					X:122
 					Y:0-24
 					Width:30