Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsToolbar.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsToolbar.cpp	(revision 68224)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsToolbar.cpp	(revision 68225)
@@ -23,6 +23,6 @@
 # include <QAction>
 # include <QButtonGroup>
+# include <QHBoxLayout>
 # include <QLabel>
-# include <QStackedLayout>
 # include <QToolButton>
 
@@ -43,5 +43,4 @@
     , m_pActionPool(pActionPool)
     , m_pLayoutMain(0)
-    , m_pLayoutStacked(0)
     , m_pTabBarMachine(0)
     , m_pTabBarGlobal(0)
@@ -147,20 +146,11 @@
 void UIToolsToolbar::sltHandleActionToggle()
 {
-    /* Acquire the sender: */
-    UIAction *pAction = sender() ? qobject_cast<UIAction*>(sender()) : 0;
-    if (!pAction)
-        pAction = m_pActionPool->action(UIActionIndexST_M_Tools_T_Machine);
-
     /* Handle known actions: */
-    if (m_pLayoutStacked)
-    {
-        if (pAction == m_pActionPool->action(UIActionIndexST_M_Tools_T_Machine))
-            m_pLayoutStacked->setCurrentWidget(m_pTabBarMachine);
-
-        else
-
-        if (pAction == m_pActionPool->action(UIActionIndexST_M_Tools_T_Global))
-            m_pLayoutStacked->setCurrentWidget(m_pTabBarGlobal);
-    }
+    const bool fShowMachine = m_pActionPool->action(UIActionIndexST_M_Tools_T_Machine)->isChecked();
+    const bool fShowGlobal  = m_pActionPool->action(UIActionIndexST_M_Tools_T_Global)->isChecked();
+    if (m_pTabBarMachine)
+        m_pTabBarMachine->setHidden(!fShowMachine);
+    if (m_pTabBarGlobal)
+        m_pTabBarGlobal->setHidden(!fShowGlobal);
 }
 
@@ -171,4 +161,7 @@
     /* Prepare widgets: */
     prepareWidgets();
+
+    /* Make sure just one tab-bar shown initially: */
+    sltHandleActionToggle();
 }
 
@@ -237,38 +230,30 @@
         m_pLayoutMain->setSpacing(10);
 
-        /* Create stacked layout: */
-        m_pLayoutStacked = new QStackedLayout(m_pLayoutMain);
-        AssertPtrReturnVoid(m_pLayoutStacked);
+        /* Create Machine tab-bar: */
+        m_pTabBarMachine = new UITabBar;
+        AssertPtrReturnVoid(m_pTabBarMachine);
         {
-            /* Create Machine tab-bar: */
-            m_pTabBarMachine = new UITabBar;
-            AssertPtrReturnVoid(m_pTabBarMachine);
-            {
-                /* Configure tab-bar: */
-                connect(m_pTabBarMachine, &UITabBar::sigTabRequestForClosing,
-                        this, &UIToolsToolbar::sltHandleCloseToolMachine);
-                connect(m_pTabBarMachine, &UITabBar::sigCurrentTabChanged,
-                        this, &UIToolsToolbar::sltHandleToolChosenMachine);
-
-                /* Add into layout: */
-                m_pLayoutStacked->addWidget(m_pTabBarMachine);
-            }
-
-            /* Create Global tab-bar: */
-            m_pTabBarGlobal = new UITabBar;
-            AssertPtrReturnVoid(m_pTabBarGlobal);
-            {
-                /* Configure tab-bar: */
-                connect(m_pTabBarGlobal, &UITabBar::sigTabRequestForClosing,
-                        this, &UIToolsToolbar::sltHandleCloseToolGlobal);
-                connect(m_pTabBarGlobal, &UITabBar::sigCurrentTabChanged,
-                        this, &UIToolsToolbar::sltHandleToolChosenGlobal);
-
-                /* Add into layout: */
-                m_pLayoutStacked->addWidget(m_pTabBarGlobal);
-            }
+            /* Configure tab-bar: */
+            connect(m_pTabBarMachine, &UITabBar::sigTabRequestForClosing,
+                    this, &UIToolsToolbar::sltHandleCloseToolMachine);
+            connect(m_pTabBarMachine, &UITabBar::sigCurrentTabChanged,
+                    this, &UIToolsToolbar::sltHandleToolChosenMachine);
 
             /* Add into layout: */
-            m_pLayoutMain->addLayout(m_pLayoutStacked);
+            m_pLayoutMain->addWidget(m_pTabBarMachine);
+        }
+
+        /* Create Global tab-bar: */
+        m_pTabBarGlobal = new UITabBar;
+        AssertPtrReturnVoid(m_pTabBarGlobal);
+        {
+            /* Configure tab-bar: */
+            connect(m_pTabBarGlobal, &UITabBar::sigTabRequestForClosing,
+                    this, &UIToolsToolbar::sltHandleCloseToolGlobal);
+            connect(m_pTabBarGlobal, &UITabBar::sigCurrentTabChanged,
+                    this, &UIToolsToolbar::sltHandleToolChosenGlobal);
+
+            /* Add into layout: */
+            m_pLayoutMain->addWidget(m_pTabBarGlobal);
         }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsToolbar.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsToolbar.h	(revision 68224)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsToolbar.h	(revision 68225)
@@ -31,5 +31,4 @@
 class QAction;
 class QHBoxLayout;
-class QStackedLayout;
 class QUuid;
 class QWidget;
@@ -98,7 +97,5 @@
 
     /** Holds the main layout instance. */
-    QHBoxLayout    *m_pLayoutMain;
-    /** Holds the stacked layout instance. */
-    QStackedLayout *m_pLayoutStacked;
+    QHBoxLayout *m_pLayoutMain;
 
     /** Holds the Machine tab-bar instance. */