diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 8470d695f5c480ef275ed3cb8c09dc38acf17b67..3b9e7103d6779e5a7cf4c0b8a858673527e4daa5 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -883,18 +883,23 @@ void MainWindow::showHILConfigurationWidget(UASInterface* uas)
 
     if (mav && !hilDocks.contains(mav->getUASID()))
     {
+        //QGCToolWidget* tool = new QGCToolWidget("Unnamed Tool " + QString::number(ui.menuTools->actions().size()));
+        //createDockWidget(centerStack->currentWidget(),tool,"Unnamed Tool " + QString::number(ui.menuTools->actions().size()),"UNNAMED_TOOL_" + QString::number(ui.menuTools->actions().size())+"DOCK",currentView,Qt::BottomDockWidgetArea);
+
         QGCHilConfiguration* hconf = new QGCHilConfiguration(mav, this);
+
         QString hilDockName = tr("HIL Config (%1)").arg(uas->getUASName());
-        QDockWidget* hilDock = new QDockWidget(hilDockName, this);
-        hilDock->setWidget(hconf);
-        hilDock->setObjectName(QString("HIL_CONFIG_%1").arg(uas->getUASID()));
+        createDockWidget(centerStack->currentWidget(),hconf,hilDockName,QString("HIL_CONFIG_%1").arg(uas->getUASID()),currentView,Qt::LeftDockWidgetArea);
+        //QDockWidget* hilDock = new QDockWidget(hilDockName, this);
+        //hilDock->setWidget(hconf);
+        //hilDock->setObjectName(QString("HIL_CONFIG_%1").arg(uas->getUASID()));
         //addTool(hilDock, hilDockName, Qt::LeftDockWidgetArea);
-        hilDocks.insert(mav->getUASID(), hilDock);
+        //hilDocks.insert(mav->getUASID(), hilDock);
 
-        if (currentView != VIEW_SIMULATION)
-            hilDock->hide();
-        else
-            hilDock->show();
+        //if (currentView != VIEW_SIMULATION)
+        //    hilDock->hide();
+        //else
+        //    hilDock->show();
     }
 }