diff --git a/gui/src/Visualization/ColorScaleEditor.cpp b/gui/src/Visualization/ColorScaleEditor.cpp
index 27ed864..893c261 100644
--- a/gui/src/Visualization/ColorScaleEditor.cpp
+++ b/gui/src/Visualization/ColorScaleEditor.cpp
@@ -151,6 +151,16 @@ void ColorScaleEditor::onThresholdChanged(bool checked)
 
         ui->minSpinBox->setEnabled(!isAutomatic);
         ui->maxSpinBox->setEnabled(!isAutomatic);
+
+        // Computes automatic thresholds
+        if (isAutomatic) {
+            double minThreshold, maxThreshold;
+            std::tie(minThreshold, maxThreshold) = SqpColorScale::computeThresholds(m_Scale);
+            ui->minSpinBox->setValue(minThreshold);
+            ui->maxSpinBox->setValue(maxThreshold);
+
+            updatePreview();
+        }
     }
 }
 
diff --git a/gui/ui/Visualization/ColorScaleEditor.ui b/gui/ui/Visualization/ColorScaleEditor.ui
index bdd36e0..32a2042 100644
--- a/gui/ui/Visualization/ColorScaleEditor.ui
+++ b/gui/ui/Visualization/ColorScaleEditor.ui
@@ -34,9 +34,6 @@
        <property name="text">
         <string>OK</string>
        </property>
-       <property name="default">
-        <bool>true</bool>
-       </property>
       </widget>
      </item>
      <item>
@@ -71,9 +68,6 @@
      </item>
      <item row="1" column="1">
       <widget class="QRadioButton" name="thresholdAutoButton">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
        <property name="text">
         <string>Automatic</string>
        </property>
@@ -158,10 +152,10 @@
  <tabstops>
   <tabstop>gradientComboBox</tabstop>
   <tabstop>thresholdAutoButton</tabstop>
-  <tabstop>okButton</tabstop>
   <tabstop>thresholdManualButton</tabstop>
-  <tabstop>maxSpinBox</tabstop>
   <tabstop>minSpinBox</tabstop>
+  <tabstop>maxSpinBox</tabstop>
+  <tabstop>okButton</tabstop>
   <tabstop>cancelButton</tabstop>
  </tabstops>
  <resources/>