Index: binaries/data/config/default.cfg
===================================================================
--- binaries/data/config/default.cfg
+++ binaries/data/config/default.cfg
@@ -313,6 +313,7 @@
 deselectgroup = Ctrl         ; Modifier to deselect units when clicking group icon, instead of selecting
 rotate.cw = RightBracket     ; Rotate building placement preview clockwise
 rotate.ccw = LeftBracket     ; Rotate building placement preview anticlockwise
+showbuildingsshortcuts.toggle = Space   ; Toggle buildings shortcut visibility
 
 [hotkey.session.gui]
 toggle = "Alt+G"             ; Toggle visibility of session GUI
@@ -334,6 +335,32 @@
 7 = "M"            ; add seventh unit type to queue
 8 = Comma          ; add eighth unit type to queue
 
+[hotkey.session.building]   ; > BUILDING SELECTION
+1 = "Space+Q"        ; select 1st building type, first row
+2 = "Space+W"        ; select 2nd building type, first row
+3 = "Space+E"        ; select 3rd building type, first row
+4 = "Space+R"        ; select 4th building type, first row
+5 = "Space+T"        ; select 5th building type, first row
+6 = "Space+Y"        ; select 6th building type, first row
+7 = "Space+U"        ; select 7th building type, first row
+8 = "Space+I"        ; select 8th building type, first row
+9 = "Space+A"        ; select 9th building type, second row
+10 = "Space+S"       ; select 10th building type, second row
+11 = "Space+D"       ; select 11th building type, second row
+12 = "Space+F"       ; select 12th building type, second row
+13 = "Space+G"       ; select 13th building type, second row
+14 = "Space+H"       ; select 14th building type, second row
+15 = "Space+J"       ; select 15th building type, second row
+16 = "Space+K"       ; select 16th building type, third row
+17 = "Space+Z"       ; select 17th building type, third row
+18 = "Space+X"       ; select 18th building type, third row
+19 = "Space+C"       ; select 19th building type, third row
+20 = "Space+V"       ; select 20th building type, third row
+21 = "Space+B"       ; select 21st building type, third row
+22 = "Space+N"       ; select 22nd building type, third row
+23 = "Space+M"       ; select 23rd building type, third row
+24 = "Space+Comma"   ; select 24th building type, third row
+
 [hotkey.session.timewarp]
 fastforward = Space               ; If timewarp mode enabled, speed up the game
 rewind = Backspace                ; If timewarp mode enabled, go back to earlier point in the game
Index: binaries/data/mods/public/gui/session/hotkeys/building.xml
===================================================================
--- binaries/data/mods/public/gui/session/hotkeys/building.xml
+++ binaries/data/mods/public/gui/session/hotkeys/building.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object>
+
+    <!-- select building 1 from construction panel  -->
+    <object hotkey="session.building.1">
+        <action on="Press">selectBuildingByPosition(0);</action>
+    </object>
+    <!-- select building 2 from construction panel  -->
+    <object hotkey="session.building.2">
+        <action on="Press">selectBuildingByPosition(1);</action>
+    </object>
+    <!-- select building 3 from construction panel  -->
+    <object hotkey="session.building.3">
+        <action on="Press">selectBuildingByPosition(2);</action>
+    </object>
+    <!-- select building 4 from construction panel  -->
+    <object hotkey="session.building.4">
+        <action on="Press">selectBuildingByPosition(3);</action>
+    </object>
+    <!-- select building 5 from construction panel  -->
+    <object hotkey="session.building.5">
+        <action on="Press">selectBuildingByPosition(4);</action>
+    </object>
+    <!-- select building 6 from construction panel  -->
+    <object hotkey="session.building.6">
+        <action on="Press">selectBuildingByPosition(5);</action>
+    </object>
+    <!-- select building 7 from construction panel  -->
+    <object hotkey="session.building.7">
+        <action on="Press">selectBuildingByPosition(6);</action>
+    </object>
+    <!-- select building 8 from construction panel  -->
+    <object hotkey="session.building.8">
+        <action on="Press">selectBuildingByPosition(7);</action>
+    </object>
+    <!-- select building 9 from construction panel  -->
+    <object hotkey="session.building.9">
+        <action on="Press">selectBuildingByPosition(8);</action>
+    </object>
+    <!-- select building 10 from construction panel  -->
+    <object hotkey="session.building.10">
+        <action on="Press">selectBuildingByPosition(9);</action>
+    </object>
+    <!-- select building 11 from construction panel  -->
+    <object hotkey="session.building.11">
+        <action on="Press">selectBuildingByPosition(10);</action>
+    </object>
+    <!-- select building 12 from construction panel  -->
+    <object hotkey="session.building.12">
+        <action on="Press">selectBuildingByPosition(11);</action>
+    </object>
+    <!-- select building 13 from construction panel  -->
+    <object hotkey="session.building.13">
+        <action on="Press">selectBuildingByPosition(12);</action>
+    </object>
+    <!-- select building 14 from construction panel  -->
+    <object hotkey="session.building.14">
+        <action on="Press">selectBuildingByPosition(13);</action>
+    </object>
+    <!-- select building 15 from construction panel  -->
+    <object hotkey="session.building.15">
+        <action on="Press">selectBuildingByPosition(14);</action>
+    </object>
+    <!-- select building 16 from construction panel  -->
+    <object hotkey="session.building.16">
+        <action on="Press">selectBuildingByPosition(15);</action>
+    </object>
+    <!-- select building 17 from construction panel  -->
+    <object hotkey="session.building.17">
+        <action on="Press">selectBuildingByPosition(16);</action>
+    </object>
+    <!-- select building 18 from construction panel  -->
+    <object hotkey="session.building.18">
+        <action on="Press">selectBuildingByPosition(17);</action>
+    </object>
+    <!-- select building 19 from construction panel  -->
+    <object hotkey="session.building.19">
+        <action on="Press">selectBuildingByPosition(18);</action>
+    </object>
+    <!-- select building 20 from construction panel  -->
+    <object hotkey="session.building.20">
+        <action on="Press">selectBuildingByPosition(19);</action>
+    </object>
+    <!-- select building 21 from construction panel  -->
+    <object hotkey="session.building.21">
+        <action on="Press">selectBuildingByPosition(20);</action>
+    </object>
+    <!-- select building 22 from construction panel  -->
+    <object hotkey="session.building.22">
+        <action on="Press">selectBuildingByPosition(21);</action>
+    </object>
+    <!-- select building 23 from construction panel  -->
+    <object hotkey="session.building.23">
+        <action on="Press">selectBuildingByPosition(22);</action>
+    </object>
+    <!-- select building 24 from construction panel  -->
+    <object hotkey="session.building.24">
+        <action on="Press">selectBuildingByPosition(23);</action>
+    </object>
+
+</object>
Index: binaries/data/mods/public/gui/session/hotkeys/misc.xml
===================================================================
--- binaries/data/mods/public/gui/session/hotkeys/misc.xml
+++ binaries/data/mods/public/gui/session/hotkeys/misc.xml
@@ -92,6 +92,11 @@
 		<action on="Release">updateSelectionDetails();</action>
 	</object>
 
+	<object hotkey="session.showbuildingsshortcuts.toggle">
+		<action on="Press">hideBuildingsShortcuts(false);</action>
+		<action on="Release">hideBuildingsShortcuts(true);</action>
+	</object>
+
 	<object hotkey="session.massbarter">
 		<action on="Press">
 			updateSelectionDetails();
Index: binaries/data/mods/public/gui/session/input.js
===================================================================
--- binaries/data/mods/public/gui/session/input.js
+++ binaries/data/mods/public/gui/session/input.js
@@ -1388,6 +1388,44 @@
 	return;
 }
 
+// Select a building from the construction panel given the current unit selected
+function selectBuildingByPosition(position)
+{
+	let playerState = GetSimState().players[Engine.GetPlayerID()];
+	let selection = g_Selection.toList();
+
+	if (!playerState || !selection.length || Engine.GetGUIObjectByName("unitConstructionPanel").hidden)
+		return;
+
+	let unitConstructionButton = Engine.GetGUIObjectByName("unitConstructionButton["+position+"]");
+
+	if( unitConstructionButton.hidden || !unitConstructionButton.enabled || !unitConstructionButton.onPress)
+		return;
+
+	unitConstructionButton.onPress();
+	return;
+}
+
+// Set construction panel hotkeys visibility
+function hideBuildingsShortcuts(hidden)
+{	
+	if( hideBuildingsShortcuts.hidden === undefined)
+		hideBuildingsShortcuts.hidden = !hidden;
+	
+	if( hideBuildingsShortcuts.hidden === hidden )
+		return;
+	
+	let i = 0;
+	let unitConstructionShortcutKeyContainer;
+	while( (unitConstructionShortcutKeyContainer = Engine.GetGUIObjectByName("unitConstructionShortcutKeyContainer[" + i + "]") ) !== undefined)
+	{
+		unitConstructionShortcutKeyContainer.hidden = hidden;
+		++i;
+	}
+	
+	hideBuildingsShortcuts.hidden = hidden;
+}
+
 // Called by GUI when user clicks training button
 function addTrainingToQueue(selection, trainEntType, playerState)
 {
Index: binaries/data/mods/public/gui/session/selection_panels.js
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels.js
+++ binaries/data/mods/public/gui/session/selection_panels.js
@@ -275,6 +275,14 @@
 			data.icon.sprite = modifier + "stretched:session/portraits/" + template.icon;
 
 		setPanelObjectPosition(data.button, data.i + getNumberOfRightPanelButtons(), data.rowLength);
+		
+		let mapNunitConstructionShortcutKey = Engine.GetGUIObjectByName("mapNunitConstructionShortcutKey[" + data.i + "]");
+		if( !mapNunitConstructionShortcutKey.caption )
+		{
+			let key = Engine.ConfigDB_GetValue("user", "hotkey." + "session.building." + (data.i + 1) );
+			mapNunitConstructionShortcutKey.caption = key.indexOf("+") == -1 ? key : key.split("+").slice(-1)[0];
+		}	
+
 		return true;
 	}
 };
Index: binaries/data/mods/public/gui/session/selection_panels_right/construction_panel.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_right/construction_panel.xml
+++ binaries/data/mods/public/gui/session/selection_panels_right/construction_panel.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<object name="unitConstructionPanel"
-	size="10 12 100% 100%"
->
+
+<object name="unitConstructionPanel" size="10 12 100% 100%">
 	<object size="0 0 100% 100%">
-	<repeat count="24">
-		<object name="unitConstructionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
-		<object name="unitConstructionIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
-		</object>
-	</repeat>
+		<repeat count="24">
+			<object name="unitConstructionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
+				<object name="unitConstructionIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
+				<object name="unitConstructionShortcutKeyContainer[n]" type="image" sprite="color: 0 0 0 120" size="3 3 20 20" hidden="true">
+					<object name="mapNunitConstructionShortcutKey[n]" type="text" style="ModernLabelText"/>
+				</object>
+			</object>
+		</repeat>
 	</object>
 </object>