diff --git a/src/Gui/Control.cpp b/src/Gui/Control.cpp
index 791bd836ab6e..4deff44791de 100644
--- a/src/Gui/Control.cpp
+++ b/src/Gui/Control.cpp
@@ -226,7 +226,9 @@ void ControlSingleton::closedDialog()
     // make sure that the combo view is shown
     QDockWidget* dw = qobject_cast<QDockWidget*>(pcComboView->parentWidget());
     if (dw)
-        dw->setFeatures(QDockWidget::AllDockWidgetFeatures);
+        dw->setFeatures(QDockWidget::DockWidgetClosable
+                        | QDockWidget::DockWidgetMovable
+                        | QDockWidget::DockWidgetFloatable);
 }
 
 bool ControlSingleton::isAllowedAlterDocument(void) const
diff --git a/src/Gui/DockWindowManager.cpp b/src/Gui/DockWindowManager.cpp
index 4bafc8c099d2..2e35a9c85cdb 100644
--- a/src/Gui/DockWindowManager.cpp
+++ b/src/Gui/DockWindowManager.cpp
@@ -155,7 +155,9 @@ QDockWidget* DockWindowManager::addDockWindow(const char* name, QWidget* widget,
     // set object name and window title needed for i18n stuff
     dw->setObjectName(QLatin1String(name));
     dw->setWindowTitle(QDockWidget::tr(name));
-    dw->setFeatures(QDockWidget::AllDockWidgetFeatures);
+    dw->setFeatures(QDockWidget::DockWidgetClosable
+                    | QDockWidget::DockWidgetMovable
+                    | QDockWidget::DockWidgetFloatable);
 
     d->_dockedWindows.push_back(dw);
     return dw;