diff --git a/src/Gui/Control.cpp b/src/Gui/Control.cpp
index 5fc93036c..5e4bf91e2 100644
--- a/src/Gui/Control.cpp
+++ b/src/Gui/Control.cpp
@@ -105,6 +105,7 @@ void ControlSingleton::showDialog(Gui::TaskView::TaskDialog *dlg)
         if (dw) {
             dw->setVisible(true);
             dw->toggleViewAction()->setVisible(true);
+            dw->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable);
         }
 
         if (ActiveDialog == dlg)
@@ -159,6 +160,10 @@ void ControlSingleton::closedDialog()
     // should return the pointer to combo view
     assert(pcCombiView);
     pcCombiView->closedDialog();
+    // make sure that the combo view is shown
+    QDockWidget* dw = qobject_cast<QDockWidget*>(pcCombiView->parentWidget());
+    if (dw)
+        dw->setFeatures(QDockWidget::AllDockWidgetFeatures);
 }
 
 bool ControlSingleton::isAllowedAlterDocument(void) const
@@ -203,5 +208,5 @@ void ControlSingleton::destruct (void)
 // -------------------------------------------
 
 
-#include "moc_Control.cpp"
-
+#include "moc_Control.cpp"
+