Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	(revision 42532)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	(revision 42533)
@@ -52,4 +52,19 @@
      * It will be set explicitly later. */
     setMenuRole(QAction::NoRole);
+}
+
+void UIAction::showShortcut()
+{
+    if (!m_shortcut.isEmpty())
+        setShortcut(m_shortcut);
+}
+
+void UIAction::hideShortcut()
+{
+    if (!shortcut().isEmpty())
+    {
+        m_shortcut = shortcut();
+        setShortcut(QKeySequence());
+    }
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h	(revision 42532)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h	(revision 42533)
@@ -66,4 +66,7 @@
     virtual void updateAppearance() {}
 
+    void showShortcut();
+    void hideShortcut();
+
 protected:
 
@@ -75,4 +78,5 @@
 
     UIActionType m_type;
+    QKeySequence m_shortcut;
 };
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 42532)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 42533)
@@ -729,4 +729,18 @@
     m_pGroupMenuAction->setVisible(m_pChooser->singleGroupSelected());
     m_pMachineMenuAction->setVisible(!m_pChooser->singleGroupSelected());
+    if (m_pGroupMenuAction->isVisible())
+    {
+        foreach (UIAction *pAction, m_machineActions)
+            pAction->hideShortcut();
+        foreach (UIAction *pAction, m_groupActions)
+            pAction->showShortcut();
+    }
+    else if (m_pMachineMenuAction->isVisible())
+    {
+        foreach (UIAction *pAction, m_groupActions)
+            pAction->hideShortcut();
+        foreach (UIAction *pAction, m_machineActions)
+            pAction->showShortcut();
+    }
 
     /* Enable/disable group actions: */
@@ -1167,4 +1181,12 @@
 //    m_pActionGroupSort = gActionPool->action(UIActionIndexSelector_Simple_Group_Sort);
 //    pMenu->addAction(m_pActionGroupSort);
+
+    /* Remember action list: */
+    m_groupActions << m_pActionGroupNewWizard << m_pActionGroupAddDialog
+                   << m_pActionGroupRenameDialog << m_pActionGroupRemoveDialog
+                   << m_pActionGroupStartOrShow << m_pActionGroupPauseAndResume
+                   << m_pActionGroupReset << m_pActionGroupRefresh
+                   << m_pActionGroupLogDialog << m_pActionGroupShowInFileManager
+                   << m_pActionGroupCreateShortcut /* << m_pActionGroupSort */;
 }
 
@@ -1209,4 +1231,13 @@
 //    m_pActionMachineSort = gActionPool->action(UIActionIndexSelector_Simple_Machine_Sort);
 //    pMenu->addAction(m_pActionMachineSort);
+
+    /* Remember action list: */
+    m_machineActions << m_pActionMachineNewWizard << m_pActionMachineAddDialog
+                     << m_pActionMachineSettingsDialog << m_pActionMachineCloneWizard
+                     << m_pActionMachineRemoveDialog << m_pActionMachineStartOrShow
+                     << m_pActionMachineDiscard << m_pActionMachinePauseAndResume
+                     << m_pActionMachineReset << m_pActionMachineRefresh
+                     << m_pActionMachineLogDialog << m_pActionMachineShowInFileManager
+                     << m_pActionMachineCreateShortcut /* << m_pActionMachineSort */;
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h	(revision 42532)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h	(revision 42533)
@@ -167,5 +167,6 @@
     UIAction *m_pExitAction;
 
-    /* 'Machine' menu action pointers: */
+    /* 'Group' menu action pointers: */
+    QList<UIAction*> m_groupActions;
     QAction *m_pGroupMenuAction;
     QMenu *m_pGroupMenu;
@@ -184,4 +185,5 @@
 
     /* 'Machine' menu action pointers: */
+    QList<UIAction*> m_machineActions;
     QAction *m_pMachineMenuAction;
     QMenu *m_pMachineMenu;