diff --git a/kstars/ekos/observatory/observatory.h b/kstars/ekos/observatory/observatory.h
--- a/kstars/ekos/observatory/observatory.h
+++ b/kstars/ekos/observatory/observatory.h
@@ -121,6 +121,7 @@
 
         // sensor data graphs
         void mouseOverLine(QMouseEvent *event);
+        void refreshSensorGraph();
 
         // reacting on weather changes
         void weatherWarningSettingsChanged();
diff --git a/kstars/ekos/observatory/observatory.cpp b/kstars/ekos/observatory/observatory.cpp
--- a/kstars/ekos/observatory/observatory.cpp
+++ b/kstars/ekos/observatory/observatory.cpp
@@ -386,6 +386,7 @@
     weatherBox->setEnabled(enable);
     clearGraphHistory->setVisible(enable);
     clearGraphHistory->setEnabled(enable);
+    autoscaleValuesCB->setVisible(enable);
     sensorGraphs->setVisible(enable);
 }
 
@@ -507,13 +508,19 @@
     connect(getWeatherModel(), &Ekos::ObservatoryWeatherModel::newStatus, this, &Ekos::Observatory::setWeatherStatus);
     connect(getWeatherModel(), &Ekos::ObservatoryWeatherModel::disconnected, this, &Ekos::Observatory::shutdownWeather);
     connect(clearGraphHistory, &QPushButton::clicked, this, &Observatory::clearSensorDataHistory);
+    connect(autoscaleValuesCB, &QCheckBox::clicked, [this](bool checked)
+    {
+        getWeatherModel()->setAutoScaleValues(checked);
+        this->refreshSensorGraph();
+    });
     connect(&weatherStatusTimer, &QTimer::timeout, [this]()
     {
         weatherWarningStatusLabel->setText(getWeatherModel()->getWarningActionsStatus());
         weatherAlertStatusLabel->setText(getWeatherModel()->getAlertActionsStatus());
     });
 
     weatherBox->setEnabled(true);
+    autoscaleValuesCB->setChecked(getWeatherModel()->autoScaleValues());
     weatherActionsBox->setVisible(true);
     weatherActionsBox->setEnabled(true);
     weatherWarningBox->setChecked(getWeatherModel()->getWarningActionsActive());
@@ -524,6 +531,8 @@
     weatherStatusTimer.start(1000);
     if (getWeatherModel()->refresh() == false)
         appendLogText(i18n("Refreshing weather data failed."));
+    // avoid double init
+    disconnect(getWeatherModel(), &Ekos::ObservatoryWeatherModel::ready, this, &Ekos::Observatory::initWeather);
 }
 
 void Observatory::shutdownWeather()
@@ -560,17 +569,12 @@
 
         // display data point
         sensorGraphs->graph()->addData(sensorGraphData[id]->last().key, sensorGraphData[id]->last().value);
-        sensorGraphs->rescaleAxes();
-        // ensure that the 0-line is visible
+
+        // determine where the x axis is relatively to the value ranges
         if ((sensorRanges[id] > 0 && value < 0) || (sensorRanges[id] < 0 && value > 0))
             sensorRanges[id] = 0;
 
-        // ensure visibility of the 0-line on the y-axis
-        if (sensorRanges[id] > 0)
-            sensorGraphs->yAxis->setRangeLower(0);
-        else if (sensorRanges[id] < 0)
-            sensorGraphs->yAxis->setRangeUpper(0);
-        sensorGraphs->replot();
+        refreshSensorGraph();
     }
 }
 
@@ -645,6 +649,23 @@
 }
 
 
+void Observatory::refreshSensorGraph()
+{
+
+    sensorGraphs->rescaleAxes();
+
+    // restrict the y-Axis to the values range
+    if (getWeatherModel()->autoScaleValues() == false)
+    {
+        if (sensorRanges[selectedSensorID] > 0)
+            sensorGraphs->yAxis->setRangeLower(0);
+        else if (sensorRanges[selectedSensorID] < 0)
+            sensorGraphs->yAxis->setRangeUpper(0);
+    }
+
+    sensorGraphs->replot();
+}
+
 void Observatory::selectedSensorChanged(QString id)
 {
     QVector<QCPGraphData> *data = sensorGraphData[id];
@@ -657,9 +678,8 @@
             container->add(QCPGraphData(it->key, it->value));
 
         sensorGraphs->graph()->setData(QSharedPointer<QCPGraphDataContainer>(container));
-        sensorGraphs->rescaleAxes();
-        sensorGraphs->replot();
         selectedSensorID = id;
+        refreshSensorGraph();
     }
 }
 
@@ -765,6 +785,8 @@
     struct WeatherActions actions;
     actions.parkDome = weatherWarningDomeCB->isChecked();
     actions.closeShutter = weatherWarningShutterCB->isChecked();
+    // Fixme: not implemented yet
+    actions.stopScheduler = false;
     actions.delay = static_cast<unsigned int>(weatherWarningDelaySB->value());
 
     getWeatherModel()->setWarningActions(actions);
@@ -775,6 +797,8 @@
     struct WeatherActions actions;
     actions.parkDome = weatherAlertDomeCB->isChecked();
     actions.closeShutter = weatherAlertShutterCB->isChecked();
+    // Fixme: not implemented yet
+    actions.stopScheduler = false;
     actions.delay = static_cast<unsigned int>(weatherAlertDelaySB->value());
 
     getWeatherModel()->setAlertActions(actions);
diff --git a/kstars/ekos/observatory/observatory.ui b/kstars/ekos/observatory/observatory.ui
--- a/kstars/ekos/observatory/observatory.ui
+++ b/kstars/ekos/observatory/observatory.ui
@@ -22,7 +22,7 @@
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <widget class="QWidget" name="">
+     <widget class="QWidget" name="layoutWidget">
       <layout class="QVBoxLayout" name="leftLayout">
        <property name="spacing">
         <number>3</number>
@@ -810,54 +810,15 @@
        <property name="horizontalSpacing">
         <number>3</number>
        </property>
-       <item row="1" column="1" colspan="6">
-        <widget class="QCustomPlot" name="sensorGraphs" native="true">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="toolTip">
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QWidget" name="sensorData" native="true">
-         <property name="minimumSize">
-          <size>
-           <width>140</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Current data of the weather sensors. Click on the sensor name to display its data over time.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="2">
-        <spacer name="horizontalSpacer_5">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="3" column="0" colspan="7" alignment="Qt::AlignTop">
+       <item row="3" column="0" colspan="6" alignment="Qt::AlignTop">
         <widget class="QGroupBox" name="weatherActionsBox">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="title">
           <string>Actions</string>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout">
+         <layout class="QHBoxLayout" name="horizontalLayout_7">
           <property name="spacing">
            <number>3</number>
           </property>
@@ -873,55 +834,55 @@
           <property name="bottomMargin">
            <number>3</number>
           </property>
-          <item alignment="Qt::AlignTop">
-           <widget class="QGroupBox" name="weatherWarningBox">
+          <item>
+           <widget class="QGroupBox" name="weatherAlertBox">
             <property name="title">
-             <string>War&amp;ning</string>
+             <string>Ale&amp;rt</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
-            <layout class="QGridLayout" name="gridLayout_6">
+            <layout class="QGridLayout" name="gridLayout_7">
              <property name="leftMargin">
               <number>3</number>
              </property>
              <property name="topMargin">
-              <number>0</number>
+              <number>3</number>
              </property>
              <property name="rightMargin">
               <number>3</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
-             <property name="spacing">
+             <property name="horizontalSpacing">
               <number>3</number>
              </property>
-             <item row="0" column="0">
-              <widget class="QCheckBox" name="weatherWarningDomeCB">
+             <item row="0" column="1">
+              <widget class="QCheckBox" name="weatherAlertShutterCB">
                <property name="text">
-                <string>Park Dome</string>
+                <string>Close Shutter</string>
                </property>
               </widget>
              </item>
-             <item row="0" column="1">
-              <widget class="QCheckBox" name="weatherWarningShutterCB">
+             <item row="0" column="0">
+              <widget class="QCheckBox" name="weatherAlertDomeCB">
                <property name="text">
-                <string>Close Shutter</string>
+                <string>Park Dome</string>
                </property>
               </widget>
              </item>
              <item row="0" column="2">
-              <widget class="QCheckBox" name="weatherWarningSchedulerCB">
+              <widget class="QCheckBox" name="weatherAlertSchedulerCB">
                <property name="text">
                 <string>Stop Scheduler</string>
                </property>
               </widget>
              </item>
              <item row="1" column="0" colspan="3">
-              <layout class="QHBoxLayout" name="horizontalLayout">
+              <layout class="QHBoxLayout" name="horizontalLayout_2">
                <item>
-                <widget class="QLabel" name="weatherWarningStatusLabel">
+                <widget class="QLabel" name="weatherAlertStatusLabel">
                  <property name="text">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Status: inactive&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
@@ -931,7 +892,7 @@
                 </widget>
                </item>
                <item>
-                <spacer name="horizontalSpacer_6">
+                <spacer name="horizontalSpacer_7">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
                  </property>
@@ -944,14 +905,14 @@
                 </spacer>
                </item>
                <item>
-                <widget class="QLabel" name="weatherWarningDelayLabel">
+                <widget class="QLabel" name="weatherAlertDelayLabel">
                  <property name="text">
                   <string>Delay (sec):</string>
                  </property>
                 </widget>
                </item>
                <item>
-                <widget class="QSpinBox" name="weatherWarningDelaySB">
+                <widget class="QSpinBox" name="weatherAlertDelaySB">
                  <property name="alignment">
                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                  </property>
@@ -966,54 +927,33 @@
            </widget>
           </item>
           <item>
-           <widget class="QGroupBox" name="weatherAlertBox">
+           <widget class="QGroupBox" name="weatherWarningBox">
             <property name="title">
-             <string>Ale&amp;rt</string>
+             <string>War&amp;ning</string>
             </property>
             <property name="checkable">
              <bool>true</bool>
             </property>
-            <layout class="QGridLayout" name="gridLayout_7">
+            <layout class="QGridLayout" name="gridLayout_6">
              <property name="leftMargin">
               <number>3</number>
              </property>
              <property name="topMargin">
-              <number>3</number>
+              <number>0</number>
              </property>
              <property name="rightMargin">
               <number>3</number>
              </property>
              <property name="bottomMargin">
               <number>0</number>
              </property>
-             <property name="horizontalSpacing">
+             <property name="spacing">
               <number>3</number>
              </property>
-             <item row="0" column="1">
-              <widget class="QCheckBox" name="weatherAlertShutterCB">
-               <property name="text">
-                <string>Close Shutter</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="0">
-              <widget class="QCheckBox" name="weatherAlertDomeCB">
-               <property name="text">
-                <string>Park Dome</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="2">
-              <widget class="QCheckBox" name="weatherAlertSchedulerCB">
-               <property name="text">
-                <string>Stop Scheduler</string>
-               </property>
-              </widget>
-             </item>
              <item row="1" column="0" colspan="3">
-              <layout class="QHBoxLayout" name="horizontalLayout_2">
+              <layout class="QHBoxLayout" name="horizontalLayout">
                <item>
-                <widget class="QLabel" name="weatherAlertStatusLabel">
+                <widget class="QLabel" name="weatherWarningStatusLabel">
                  <property name="text">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Status: inactive&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
@@ -1023,7 +963,7 @@
                 </widget>
                </item>
                <item>
-                <spacer name="horizontalSpacer_7">
+                <spacer name="horizontalSpacer_6">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
                  </property>
@@ -1036,14 +976,14 @@
                 </spacer>
                </item>
                <item>
-                <widget class="QLabel" name="weatherAlertDelayLabel">
+                <widget class="QLabel" name="weatherWarningDelayLabel">
                  <property name="text">
                   <string>Delay (sec):</string>
                  </property>
                 </widget>
                </item>
                <item>
-                <widget class="QSpinBox" name="weatherAlertDelaySB">
+                <widget class="QSpinBox" name="weatherWarningDelaySB">
                  <property name="alignment">
                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                  </property>
@@ -1054,29 +994,60 @@
                </item>
               </layout>
              </item>
+             <item row="0" column="0">
+              <widget class="QCheckBox" name="weatherWarningDomeCB">
+               <property name="text">
+                <string>Park Dome</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="2">
+              <widget class="QCheckBox" name="weatherWarningSchedulerCB">
+               <property name="text">
+                <string>Stop Scheduler</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QCheckBox" name="weatherWarningShutterCB">
+               <property name="text">
+                <string>Close Shutter</string>
+               </property>
+              </widget>
+             </item>
             </layout>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
-       <item row="0" column="4">
-        <spacer name="horizontalSpacer_3">
+       <item row="1" column="1" rowspan="2" colspan="5">
+        <widget class="QCustomPlot" name="sensorGraphs" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="2">
+        <spacer name="horizontalSpacer_5">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>10</width>
+           <width>40</width>
            <height>20</height>
           </size>
          </property>
         </spacer>
        </item>
-       <item row="0" column="5">
+       <item row="0" column="4">
         <widget class="QLabel" name="weatherStatusLabel">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -1101,40 +1072,95 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="3">
-        <widget class="QPushButton" name="clearGraphHistory">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
+       <item row="1" column="0">
+        <widget class="QWidget" name="sensorData" native="true">
          <property name="minimumSize">
           <size>
-           <width>24</width>
-           <height>24</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>24</width>
-           <height>24</height>
+           <width>140</width>
+           <height>0</height>
           </size>
          </property>
          <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Clear sensor data history&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="icon">
-          <iconset theme="edit-delete"/>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>24</width>
-           <height>24</height>
-          </size>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Current data of the weather sensors. Click on the sensor name to display its data over time.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>
+       <item row="2" column="0">
+        <widget class="QFrame" name="horizontalFrame">
+         <layout class="QHBoxLayout" name="graphActionsBox">
+          <property name="leftMargin">
+           <number>9</number>
+          </property>
+          <property name="topMargin">
+           <number>3</number>
+          </property>
+          <property name="rightMargin">
+           <number>9</number>
+          </property>
+          <property name="bottomMargin">
+           <number>3</number>
+          </property>
+          <item>
+           <widget class="QCheckBox" name="autoscaleValuesCB">
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Scale the value axis to the current value range.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="text">
+             <string>auto scale values</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QPushButton" name="clearGraphHistory">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>24</width>
+              <height>24</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>24</width>
+              <height>24</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Clear sensor data history&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="icon">
+             <iconset theme="edit-delete">
+              <normaloff>.</normaloff>.</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>24</width>
+              <height>24</height>
+             </size>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>
diff --git a/kstars/ekos/observatory/observatoryweathermodel.h b/kstars/ekos/observatory/observatoryweathermodel.h
--- a/kstars/ekos/observatory/observatoryweathermodel.h
+++ b/kstars/ekos/observatory/observatoryweathermodel.h
@@ -68,6 +68,11 @@
          */
         std::vector<ISD::Weather::WeatherData> getWeatherData() { return m_WeatherData; }
 
+        /**
+         * @brief Flag whether the X axis should be visible in the sensor graph
+         */
+        bool autoScaleValues() {return m_autoScaleValues;}
+        void setAutoScaleValues(bool show);
 
     public slots:
         /**
@@ -79,11 +84,11 @@
          */
         void setAlertActionsActive(bool active);
 
-    private:
+private:
         Weather *weatherInterface;
         QTimer warningTimer, alertTimer;
         struct WeatherActions warningActions, alertActions;
-        bool warningActionsActive, alertActionsActive;
+        bool warningActionsActive, alertActionsActive, m_autoScaleValues;
 
         void startAlertTimer();
         void startWarningTimer();
diff --git a/kstars/ekos/observatory/observatoryweathermodel.cpp b/kstars/ekos/observatory/observatoryweathermodel.cpp
--- a/kstars/ekos/observatory/observatoryweathermodel.cpp
+++ b/kstars/ekos/observatory/observatoryweathermodel.cpp
@@ -35,6 +35,7 @@
     alertActions.parkDome = Options::weatherAlertCloseDome();
     alertActions.closeShutter = Options::weatherAlertCloseShutter();
     alertActions.delay = Options::weatherAlertDelay();
+    m_autoScaleValues = Options::weatherAutoScaleValues();
 
     // not implemented yet
     warningActions.stopScheduler = false;
@@ -108,6 +109,12 @@
         startAlertTimer();
 }
 
+void ObservatoryWeatherModel::setAutoScaleValues(bool value)
+{
+    m_autoScaleValues = value;
+    Options::setWeatherAutoScaleValues(value);
+}
+
 void ObservatoryWeatherModel::startAlertTimer()
 {
     if (alertActionsActive && (alertActions.parkDome || alertActions.closeShutter || alertActions.stopScheduler))
diff --git a/kstars/kstars.kcfg b/kstars/kstars.kcfg
--- a/kstars/kstars.kcfg
+++ b/kstars/kstars.kcfg
@@ -2447,6 +2447,10 @@
       <label>Weather status relevant for the Observatory status.</label>
       <default>true</default>
    </entry>
+   <entry name="weatherAutoScaleValues" type="Bool">
+      <label>Scale the sensor graph value axis to the values range.</label>
+      <default>true</default>
+   </entry>
    </group>
    <group name="ASTAP">
    <entry name="ASTAPExecutable" type="String">