diff --git a/src/Gui/DlgPreferencesImp.cpp b/src/Gui/DlgPreferencesImp.cpp
index f7868d5a49..260ed4132e 100644
--- a/src/Gui/DlgPreferencesImp.cpp
+++ b/src/Gui/DlgPreferencesImp.cpp
@@ -298,7 +298,7 @@ void DlgPreferencesImp::applyChanges()
 
 void DlgPreferencesImp::showEvent(QShowEvent* ev)
 {
-    canEmbedScrollArea = false;
+    //canEmbedScrollArea = false;
     QDialog::showEvent(ev);
 }
 
@@ -308,7 +308,7 @@ void DlgPreferencesImp::resizeEvent(QResizeEvent* ev)
         // embed the widget stack into a scroll area if the size is
         // bigger than the available desktop
         QRect rect = QApplication::desktop()->availableGeometry();
-        int maxHeight = rect.height();
+        int maxHeight = rect.height() - 60;
         int maxWidth = rect.width();
         if (height() > maxHeight || width() > maxWidth) {
             canEmbedScrollArea = false;
@@ -325,7 +325,7 @@ void DlgPreferencesImp::resizeEvent(QResizeEvent* ev)
             if (bar) {
                 int newWidth = width() + bar->width();
                 newWidth = std::min<int>(newWidth, maxWidth);
-                int newHeight = std::min<int>(height(), maxHeight-30);
+                int newHeight = std::min<int>(height(), maxHeight);
                 QMetaObject::invokeMethod(this, "resizeWindow",
                     Qt::QueuedConnection,
                     QGenericReturnArgument(),