diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index d5b8256..fb3c142 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -387,25 +387,31 @@ void MainWindow::buildCustomWidget()
             int view = settings.value(QString("TOOL_PARENT_") + tool->objectName(),-1).toInt();
             //settings.setValue(QString("TOOL_PARENT_") + "UNNAMED_TOOL_" + QString::number(ui.menuTools->actions().size()),currentView);
             settings.endGroup();
+
+            QDockWidget* dock;
+
             switch (view)
             {
             case VIEW_ENGINEER:
-                createDockWidget(dataView,tool,tool->getTitle(),tool->objectName(),(VIEW_SECTIONS)view,location);
+                dock = createDockWidget(dataView,tool,tool->getTitle(),tool->objectName(),(VIEW_SECTIONS)view,location);
                 break;
             case VIEW_FLIGHT:
-                createDockWidget(pilotView,tool,tool->getTitle(),tool->objectName(),(VIEW_SECTIONS)view,location);
+                dock = createDockWidget(pilotView,tool,tool->getTitle(),tool->objectName(),(VIEW_SECTIONS)view,location);
                 break;
             case VIEW_SIMULATION:
-                createDockWidget(simView,tool,tool->getTitle(),tool->objectName(),(VIEW_SECTIONS)view,location);
+                dock = createDockWidget(simView,tool,tool->getTitle(),tool->objectName(),(VIEW_SECTIONS)view,location);
                 break;
             case VIEW_MISSION:
-                createDockWidget(plannerView,tool,tool->getTitle(),tool->objectName(),(VIEW_SECTIONS)view,location);
+                dock = createDockWidget(plannerView,tool,tool->getTitle(),tool->objectName(),(VIEW_SECTIONS)view,location);
                 break;
             default:
-                createDockWidget(centerStack->currentWidget(),tool,tool->getTitle(),tool->objectName(),(VIEW_SECTIONS)view,location);
+                dock = createDockWidget(centerStack->currentWidget(),tool,tool->getTitle(),tool->objectName(),(VIEW_SECTIONS)view,location);
                 break;
             }
 
+            // XXX temporary "fix"
+            dock->hide();
+
             //createDockWidget(0,tool,tool->getTitle(),tool->objectName(),view,location);
         }
     }
@@ -663,7 +669,7 @@ void MainWindow::addTool(SubMainWindow *parent,VIEW_SECTIONS view,QDockWidget* w
     parent->addDockWidget(area,widget);
 }
 
-void MainWindow::createDockWidget(QWidget *parent,QWidget *child,QString title,QString objectname,VIEW_SECTIONS view,Qt::DockWidgetArea area,int minwidth,int minheight)
+QDockWidget* MainWindow::createDockWidget(QWidget *parent,QWidget *child,QString title,QString objectname,VIEW_SECTIONS view,Qt::DockWidgetArea area,int minwidth,int minheight)
 {
     //if (child->objectName() == "")
     //{
@@ -702,6 +708,8 @@ void MainWindow::createDockWidget(QWidget *parent,QWidget *child,QString title,Q
         widget->setMinimumWidth(minwidth);
     }
     addTool(qobject_cast<SubMainWindow*>(parent),view,widget,title,area);
+
+    return widget;
 }
 void MainWindow::loadDockWidget(QString name)
 {
diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h
index cae4a26..a9f4759 100644
--- a/src/ui/MainWindow.h
+++ b/src/ui/MainWindow.h
@@ -297,7 +297,7 @@ protected:
      */
     void addTool(SubMainWindow *parent,VIEW_SECTIONS view,QDockWidget* widget, const QString& title, Qt::DockWidgetArea area);
     void loadDockWidget(QString name);
-void createDockWidget(QWidget *parent,QWidget *child,QString title,QString objectname,VIEW_SECTIONS view,Qt::DockWidgetArea area,int minwidth=0,int minheight=0);
+    QDockWidget* createDockWidget(QWidget *parent,QWidget *child,QString title,QString objectname,VIEW_SECTIONS view,Qt::DockWidgetArea area,int minwidth=0,int minheight=0);
     /**
      * @brief Adds an already instantiated QWidget to the center stack
      *