diff --git a/Engine/Settings.cpp b/Engine/Settings.cpp
index 859cb013d6..21780b4311 100644
--- a/Engine/Settings.cpp
+++ b/Engine/Settings.cpp
@@ -592,8 +592,8 @@ Settings::initializeKnobsUserInterface()
                                          "held by the properties dock at the same time."
                                          "The special value of 0 indicates there can be an unlimited number of panels opened.") );
     _maxPanelsOpened->disableSlider();
-    _maxPanelsOpened->setMinimum(1);
-    _maxPanelsOpened->setMaximum(100);
+    _maxPanelsOpened->setMinimum(0);
+    _maxPanelsOpened->setMaximum(99);
     _uiPage->addKnob(_maxPanelsOpened);
 
     _useCursorPositionIncrements = AppManager::createKnob<KnobBool>( this, tr("Value increments based on cursor position") );
diff --git a/Gui/GuiPrivate.cpp b/Gui/GuiPrivate.cpp
index 40f46842da..52f4e714b5 100644
--- a/Gui/GuiPrivate.cpp
+++ b/Gui/GuiPrivate.cpp
@@ -371,9 +371,12 @@ GuiPrivate::createPropertiesBinGui()
     QObject::connect( _minimizeAllPanelsButtons, SIGNAL(clicked(bool)), _gui, SLOT(minimizeMaximizeAllPanels(bool)) );
 
     _maxPanelsOpenedSpinBox = new SpinBox(propertiesAreaButtonsContainer);
-    _maxPanelsOpenedSpinBox->setMaximumSize(smallButtonSize);
-    _maxPanelsOpenedSpinBox->setMinimum(1);
-    _maxPanelsOpenedSpinBox->setMaximum(100);
+    const int fontSize = appPTR->getAppFontSize();
+    const QSize maxPanelsOpenedSpinBoxSize(TO_DPIX(std::max(NATRON_SMALL_BUTTON_SIZE, 2 * fontSize)),
+                                           TO_DPIY(std::max(NATRON_SMALL_BUTTON_SIZE, fontSize * 3 / 2)));
+    _maxPanelsOpenedSpinBox->setFixedSize(maxPanelsOpenedSpinBoxSize);
+    _maxPanelsOpenedSpinBox->setMinimum(0);
+    _maxPanelsOpenedSpinBox->setMaximum(99);
     _maxPanelsOpenedSpinBox->setToolTip( NATRON_NAMESPACE::convertFromPlainText(tr("Set the maximum of panels that can be opened at the same time "
                                                                            "in the properties bin pane. The special value of 0 indicates "
                                                                            "that an unlimited number of panels can be opened."),