diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs
index aebc3e63f0..081226727b 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs
@@ -29,7 +29,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 				if (tabs.QueueGroup == button.ProductionGroup)
 					tabs.SelectNextTab(reverse);
 				else
-				tabs.QueueGroup = button.ProductionGroup;
+					tabs.QueueGroup = button.ProductionGroup;
 			};
 
 			button.IsDisabled = () => tabs.Groups[button.ProductionGroup].Tabs.Count == 0;
diff --git a/OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs b/OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs
index 98f881aa99..1eb017e282 100644
--- a/OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs
@@ -97,8 +97,6 @@ namespace OpenRA.Mods.RA.Widgets
 			if (queueGroup == null)
 				return true;
 
-			Sound.PlayNotification(world.Map.Rules, null, "Sounds", "ClickSound", null);
-
 			// Prioritize alerted queues
 			var queues = Groups[queueGroup].Tabs.Select(t => t.Queue)
 					.OrderByDescending(q => q.CurrentDone ? 1 : 0)
@@ -281,9 +279,15 @@ namespace OpenRA.Mods.RA.Widgets
 			var hotkey = Hotkey.FromKeyInput(e);
 
 			if (hotkey == Game.Settings.Keys.NextProductionTabKey)
+			{
+				Sound.PlayNotification(world.Map.Rules, null, "Sounds", "ClickSound", null);
 				return SelectNextTab(false);
+			}
 			else if (hotkey == Game.Settings.Keys.PreviousProductionTabKey)
+			{
+				Sound.PlayNotification(world.Map.Rules, null, "Sounds", "ClickSound", null);
 				return SelectNextTab(true);
+			}
 
 			return false;
 		}
diff --git a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
index ce2a21ac7f..027b133649 100644
--- a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
@@ -227,6 +227,8 @@ namespace OpenRA.Mods.RA.Widgets
 
 			world.Selection.Combine(world, new Actor[] { next }, false, true);
 
+			Sound.PlayNotification(world.Map.Rules, null, "Sounds", "ClickSound", null);
+
 			return ToSelection();
 		}
 
diff --git a/mods/cnc/chrome/ingame-infoobjectives.yaml b/mods/cnc/chrome/ingame-infoobjectives.yaml
index b61e92a4af..6b987a2f27 100644
--- a/mods/cnc/chrome/ingame-infoobjectives.yaml
+++ b/mods/cnc/chrome/ingame-infoobjectives.yaml
@@ -1,5 +1,5 @@
 Container@MISSION_OBJECTIVES:
-	Height:	PARENT_BOTTOM
+	Height: PARENT_BOTTOM
 	Width: PARENT_RIGHT
 	Logic: GameInfoObjectivesLogic
 	Children: