Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 68372)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 68373)
@@ -281,4 +281,7 @@
     m_pPaneToolsMachine->setCurrentItem(pItem);
 
+    /* Update Machine tab-bar visibility */
+    m_pTabBarMachine->setEnabled(pItem && pItem->accessible());
+
     /* If current item exists & accessible: */
     if (pItem && pItem->accessible())
@@ -289,8 +292,8 @@
             /* Make sure Details or Snapshot pane is chosen if opened: */
             if (m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Details))
-                m_pPaneToolsMachine->openTool(ToolTypeMachine_Details);
+                actionPool()->action(UIActionIndexST_M_Tools_M_Machine_Details)->trigger();
             else
             if (m_pPaneToolsMachine->isToolOpened(ToolTypeMachine_Snapshots))
-                m_pPaneToolsMachine->openTool(ToolTypeMachine_Snapshots);
+                actionPool()->action(UIActionIndexST_M_Tools_M_Machine_Snapshots)->trigger();
         }
 
@@ -1091,4 +1094,7 @@
     /* Update action visibility: */
     updateActionsVisibility();
+
+    /* Make sure chosen item fetched: */
+    sltHandleChooserPaneIndexChange(false /* update details? */, false /* update snapshots? */);
 }
 
@@ -1174,5 +1180,5 @@
     setWindowTitle(strTitle);
 
-    /* Make sure details and snapshot panes are updated: */
+    /* Make sure chosen item fetched: */
     sltHandleChooserPaneIndexChange(false /* update details? */, false /* update snapshots? */);
 
@@ -2379,4 +2385,9 @@
     actionPool()->action(UIActionIndexST_M_Machine_T_Pause)->blockSignals(false);
 
+    /* Enable/disable tools actions: */
+    actionPool()->action(UIActionIndexST_M_Tools_M_Machine)->setEnabled(isActionEnabled(UIActionIndexST_M_Tools_M_Machine, items));
+    actionPool()->action(UIActionIndexST_M_Tools_M_Machine_Details)->setEnabled(isActionEnabled(UIActionIndexST_M_Tools_M_Machine_Details, items));
+    actionPool()->action(UIActionIndexST_M_Tools_M_Machine_Snapshots)->setEnabled(isActionEnabled(UIActionIndexST_M_Tools_M_Machine_Snapshots, items));
+
 #ifdef VBOX_WS_MAC
     // WORKAROUND:
@@ -2512,4 +2523,10 @@
         {
             return isActionEnabled(UIActionIndexST_M_Machine_M_Close, items);
+        }
+        case UIActionIndexST_M_Tools_M_Machine:
+        case UIActionIndexST_M_Tools_M_Machine_Details:
+        case UIActionIndexST_M_Tools_M_Machine_Snapshots:
+        {
+            return pItem->accessible();
         }
         default: