diff --git a/interface/src/ui/ToolWindow.cpp b/interface/src/ui/ToolWindow.cpp
index bb62929846..de4b3887db 100644
--- a/interface/src/ui/ToolWindow.cpp
+++ b/interface/src/ui/ToolWindow.cpp
@@ -22,6 +22,8 @@ ToolWindow::ToolWindow(QWidget* parent) :
     _hasShown(false),
     _lastGeometry() {
 
+    setTabPosition(Qt::TopDockWidgetArea, QTabWidget::TabPosition::North);
+
 #   ifndef Q_OS_LINUX
     setDockOptions(QMainWindow::ForceTabbedDocks);
 #   endif
@@ -120,12 +122,9 @@ void ToolWindow::addDockWidget(Qt::DockWidgetArea area, QDockWidget* dockWidget)
 
 void ToolWindow::addDockWidget(Qt::DockWidgetArea area, QDockWidget* dockWidget, Qt::Orientation orientation) {
     QList<QDockWidget*> dockWidgets = findChildren<QDockWidget*>();
-    
-    setTabPosition(Qt::TopDockWidgetArea, QTabWidget::TabPosition::North);
 
     QMainWindow::addDockWidget(area, dockWidget, orientation);
 
-    // We want to force tabbing, so retabify all of our widgets.
     QDockWidget* lastDockWidget = dockWidget;
 
     foreach(QDockWidget* nextDockWidget, dockWidgets) {
diff --git a/interface/src/ui/ToolWindow.h b/interface/src/ui/ToolWindow.h
index 03ae85a418..43ab1ac2ce 100644
--- a/interface/src/ui/ToolWindow.h
+++ b/interface/src/ui/ToolWindow.h
@@ -7,7 +7,7 @@
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
+// 
 
 #ifndef hifi_ToolWindow_h
 #define hifi_ToolWindow_h