diff --git a/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs b/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs
index a6b0f8db61..34a39bdad6 100644
--- a/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs
+++ b/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs
@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation. For more information,
@@ -198,15 +198,17 @@ namespace OpenRA.Widgets
 		{
 			if (e.Event == KeyInputEvent.Down)
 			{
-				if (Hotkey.FromKeyInput(e) == Game.Settings.Keys.PauseKey && World.LocalPlayer != null) // Disable pausing for spectators
+				var key = Hotkey.FromKeyInput(e);
+
+				if (key == Game.Settings.Keys.PauseKey && World.LocalPlayer != null) // Disable pausing for spectators
 					World.SetPauseState(!World.Paused);
-				else if (Hotkey.FromKeyInput(e) == Game.Settings.Keys.SelectAllUnitsKey)
+				else if (key == Game.Settings.Keys.SelectAllUnitsKey)
 				{
 					var ownUnitsOnScreen = SelectActorsInBox(World, worldRenderer.Viewport.TopLeft, worldRenderer.Viewport.BottomRight,
 						a => a.Owner == World.RenderPlayer);
 					World.Selection.Combine(World, ownUnitsOnScreen, false, false);
 				}
-				else if (Hotkey.FromKeyInput(e) == Game.Settings.Keys.SelectUnitsByTypeKey)
+				else if (key == Game.Settings.Keys.SelectUnitsByTypeKey)
 				{
 					var selectedTypes = World.Selection.Actors.Where(
 						x => x.Owner == World.RenderPlayer).Select(a => a.Info);
@@ -222,8 +224,13 @@ namespace OpenRA.Widgets
 							World.Map.Bounds.BottomRightAsCPos().BottomRight).Where(cond);
 						Game.Debug("Selected across map");
 					}
+
 					World.Selection.Combine(World, newSelection, true, false);
 				}
+				else if (key == Game.Settings.Keys.ToggleStatusBarsKey)
+					return ToggleStatusBars();
+				else if (key == Game.Settings.Keys.TogglePixelDoubleKey)
+					return TogglePixelDouble();
 			}
 
 			return false;
@@ -239,6 +246,19 @@ namespace OpenRA.Widgets
 				.DefaultIfEmpty(NoActors)
 				.FirstOrDefault();
 		}
+
+		bool ToggleStatusBars()
+		{
+			Game.Settings.Game.AlwaysShowStatusBars ^= true;
+			return true;
+		}
+
+		bool TogglePixelDouble()
+		{
+			Game.Settings.Graphics.PixelDouble ^= true;
+			worldRenderer.Viewport.Zoom = Game.Settings.Graphics.PixelDouble ? 2 : 1;
+			return true;
+		}
 	}
 
 	static class PriorityExts
diff --git a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
index f5c2417327..035092e0b4 100644
--- a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
@@ -62,11 +62,6 @@ namespace OpenRA.Mods.RA.Widgets
 				if (key == ks.ToSelectionKey)
 					return ToSelection();
 
-				if (key == ks.ToggleStatusBarsKey)
-					return ToggleStatusBars();
-
-				if (key == ks.TogglePixelDoubleKey)
-					return TogglePixelDouble();
 
 				// Put all functions that aren't unit-specific before this line!
 				if (!world.Selection.Actors.Any())
@@ -135,7 +130,7 @@ namespace OpenRA.Mods.RA.Widgets
 
 		bool PerformDeploy()
 		{
-			/* hack: multiple orders here */
+			// HACK: multiple orders here
 			PerformKeyboardOrderOnSelection(a => new Order("ReturnToBase", a, false));
 			PerformKeyboardOrderOnSelection(a => new Order("DeployTransform", a, false));
 			PerformKeyboardOrderOnSelection(a => new Order("Unload", a, false));
@@ -250,18 +245,5 @@ namespace OpenRA.Mods.RA.Widgets
 			worldRenderer.Viewport.Center(world.Selection.Actors);
 			return true;
 		}
-
-		static bool ToggleStatusBars()
-		{
-			Game.Settings.Game.AlwaysShowStatusBars ^= true;
-			return true;
-		}
-
-		bool TogglePixelDouble()
-		{
-			Game.Settings.Graphics.PixelDouble ^= true;
-			worldRenderer.Viewport.Zoom = Game.Settings.Graphics.PixelDouble ? 2 : 1;
-			return true;
-		}
 	}
 }