Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 68198)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 68199)
@@ -206,22 +206,6 @@
     UIVMItem *pItem = currentItem();
 
-    /* Determine which menu to show: */
-    m_pGroupMenuAction->setVisible(m_pPaneChooser->isSingleGroupSelected());
-    m_pMachineMenuAction->setVisible(!m_pPaneChooser->isSingleGroupSelected());
-    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();
-    }
-
+    /* Update action visibility: */
+    updateActionsVisibility();
     /* Update action appearance: */
     updateActionsAppearance();
@@ -1699,5 +1683,5 @@
         m_pToolBar->setContextMenuPolicy(Qt::CustomContextMenu);
         m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-        // TODO: Get red of hard-coded stuff:
+        // TODO: Get rid of hard-coded stuff:
         const QSize toolBarIconSize = m_pToolBar->iconSize();
         if (toolBarIconSize.width() < 32 || toolBarIconSize.height() < 32)
@@ -1931,5 +1915,4 @@
     connect(m_pPaneToolsMachine, SIGNAL(sigLinkClicked(const QString&, const QString&, const QString&)),
             this, SLOT(sltOpenMachineSettingsDialog(const QString&, const QString&, const QString&)));
-
 
     /* Global event handlers: */
@@ -2085,4 +2068,28 @@
             vboxGlobal().launchMachine(machine, enmItemLaunchMode);
         }
+}
+
+void UISelectorWindow::updateActionsVisibility()
+{
+    /* Determine whether Machine or Group menu should be shown at all: */
+    const bool fMachineMenuShown = !m_pPaneChooser->isSingleGroupSelected();
+    m_pMachineMenuAction->setVisible(fMachineMenuShown);
+    m_pGroupMenuAction->setVisible(!fMachineMenuShown);
+
+    /* Hide action shortcuts: */
+    if (!fMachineMenuShown)
+        foreach (UIAction *pAction, m_machineActions)
+            pAction->hideShortcut();
+    if (fMachineMenuShown)
+        foreach (UIAction *pAction, m_groupActions)
+            pAction->hideShortcut();
+
+    /* Show what should be shown: */
+    if (fMachineMenuShown)
+        foreach (UIAction *pAction, m_machineActions)
+            pAction->showShortcut();
+    if (!fMachineMenuShown)
+        foreach (UIAction *pAction, m_groupActions)
+            pAction->showShortcut();
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h	(revision 68198)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h	(revision 68199)
@@ -267,4 +267,6 @@
     /** @name Action update stuff.
       * @{ */
+        /** Performs update of actions visibility. */
+        void updateActionsVisibility();
         /** Performs update of actions appearance. */
         void updateActionsAppearance();
@@ -325,5 +327,5 @@
     /** Holds the Chooser-pane instance. */
     UIGChooser         *m_pPaneChooser;
-    /** Holds the Tools-pane instance. */
+    /** Holds the Machine Tools-pane instance. */
     UIToolsPaneMachine *m_pPaneToolsMachine;