diff --git a/src/data/ui/SchedulePage.ui b/src/data/ui/SchedulePage.ui
index b8dc4ae..924436a 100644
--- a/src/data/ui/SchedulePage.ui
+++ b/src/data/ui/SchedulePage.ui
@@ -30,6 +30,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 <property name="margin-top">12</property>
                 <property name="margin-bottom">12</property>
                 <property name="valign">center</property>
+                <signal name="notify::time" handler="onSunriseTimeChanged"/>
               </object>
             </child>
           </object>
@@ -42,6 +43,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 <property name="margin-top">12</property>
                 <property name="margin-bottom">12</property>
                 <property name="valign">center</property>
+                <signal name="notify::time" handler="onSunsetTimeChanged"/>
               </object>
             </child>
           </object>
diff --git a/src/preferences/SchedulePage.js b/src/preferences/SchedulePage.js
index c234b19..68c23a2 100644
--- a/src/preferences/SchedulePage.js
+++ b/src/preferences/SchedulePage.js
@@ -34,4 +34,14 @@ var SchedulePage = GObject.registerClass({
         });
         this._keyboard_shortcut_button.keybinding = settings.get_strv('nightthemeswitcher-ondemand-keybinding')[0];
     }
+
+    onSunriseTimeChanged(_chooser) {
+        if (this._schedule_sunrise_time_chooser.time >= this._schedule_sunset_time_chooser.time)
+            this._schedule_sunset_time_chooser.time = this._schedule_sunrise_time_chooser.time + 1 / 60;
+    }
+
+    onSunsetTimeChanged(_chooser) {
+        if (this._schedule_sunset_time_chooser.time <= this._schedule_sunrise_time_chooser.time)
+            this._schedule_sunrise_time_chooser.time = this._schedule_sunset_time_chooser.time - 1 / 60;
+    }
 });