diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
index f4e04c13f8..7e9fc8f666 100644
--- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
+++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
@@ -94,6 +94,7 @@
     <Compile Include="Widgets\SiloBarWidget.cs" />
     <Compile Include="Widgets\ProductionTabsWidget.cs" />
     <Compile Include="Widgets\ProductionPaletteWidget.cs" />
+    <Compile Include="ProductionQueueFromSelection.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
diff --git a/OpenRA.Mods.Cnc/ProductionQueueFromSelection.cs b/OpenRA.Mods.Cnc/ProductionQueueFromSelection.cs
new file mode 100644
index 0000000000..6284869a30
--- /dev/null
+++ b/OpenRA.Mods.Cnc/ProductionQueueFromSelection.cs
@@ -0,0 +1,46 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 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,
+ * see COPYING.
+ */
+#endregion
+
+using System.Linq;
+using OpenRA.Traits;
+using OpenRA.Widgets;
+using OpenRA.Mods.Cnc.Widgets;
+
+namespace OpenRA.Mods.RA.Widgets
+{
+	class ProductionQueueFromSelectionInfo : ITraitInfo
+	{
+		public string ProductionTabsWidget = null;
+		public object Create( ActorInitializer init ) { return new ProductionQueueFromSelection(init.world, this); }
+	}
+
+	class ProductionQueueFromSelection : INotifySelection
+	{
+		ProductionQueueFromSelectionInfo info;
+		readonly World world;
+
+		public ProductionQueueFromSelection(World world, ProductionQueueFromSelectionInfo info)
+		{
+			this.world = world;
+			this.info = info;
+		}
+
+		public void SelectionChanged()
+		{
+			// Find an actor with a queue
+			var producer = world.Selection.Actors.FirstOrDefault(a => a.IsInWorld
+			                                                     && a.World.LocalPlayer == a.Owner
+			                                                     && a.HasTrait<ProductionQueue>());
+			if (producer != null)			
+				Widget.RootWidget.GetWidget<ProductionTabsWidget>(info.ProductionTabsWidget)
+					.SelectQueue(producer.TraitsImplementing<ProductionQueue>().First());
+		}
+	}
+}
diff --git a/OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs b/OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs
index 368479d9ff..bfdbb691e2 100755
--- a/OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs
+++ b/OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs
@@ -212,5 +212,12 @@ namespace OpenRA.Mods.Cnc.Widgets
 
 			return (leftPressed || rightPressed);
 		}
+
+		public void SelectQueue(ProductionQueue queue)
+		{
+			QueueType = queue.Info.Group;
+			Widget.RootWidget.GetWidget<ProductionPaletteWidget>(PaletteWidget)
+					.CurrentQueue = queue;
+		}
 	}
 }
diff --git a/mods/cnc/rules/system.yaml b/mods/cnc/rules/system.yaml
index fed991ce4e..1517c646b7 100644
--- a/mods/cnc/rules/system.yaml
+++ b/mods/cnc/rules/system.yaml
@@ -94,7 +94,8 @@ World:
 	Country@nod:
 		Name: Nod
 		Race: nod
-#	ChooseBuildTabOnSelect:
+	ProductionQueueFromSelection:
+		ProductionTabsWidget: PRODUCTION_TABS
 	BibLayer:
 	ResourceLayer:
 	ResourceType@green-tib: