diff --git a/src/data/ui/SchedulePage.ui b/src/data/ui/SchedulePage.ui
index 31976d3..1c0f7ce 100644
--- a/src/data/ui/SchedulePage.ui
+++ b/src/data/ui/SchedulePage.ui
@@ -11,33 +11,38 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <child>
       <object class="AdwPreferencesGroup">
         <child>
-          <object class="AdwSwitchRow" id="manual_schedule_switch">
+          <object class="AdwExpanderRow">
             <property name="title" translatable="yes">Manual schedule</property>
             <property name="subtitle" translatable="yes">Use a manual schedule instead of the one computed from your location.</property>
-          </object>
-        </child>
-        <child>
-          <object class="AdwActionRow">
-            <property name="title" translatable="yes">Sunrise</property>
-            <property name="sensitive" bind-source="manual_schedule_switch" bind-property="active" bind-flags="sync-create"/>
-            <child>
-              <object class="TimeChooser" id="schedule_sunrise_time_chooser">
-                <property name="margin-top">12</property>
-                <property name="margin-bottom">12</property>
+            <child type="suffix">
+              <object class="GtkSwitch" id="manual_schedule_switch">
                 <property name="valign">center</property>
               </object>
             </child>
-          </object>
-        </child>
-        <child>
-          <object class="AdwActionRow">
-            <property name="title" translatable="yes">Sunset</property>
-            <property name="sensitive" bind-source="manual_schedule_switch" bind-property="active" bind-flags="sync-create"/>
             <child>
-              <object class="TimeChooser" id="schedule_sunset_time_chooser">
-                <property name="margin-top">12</property>
-                <property name="margin-bottom">12</property>
-                <property name="valign">center</property>
+              <object class="AdwActionRow">
+                <property name="title" translatable="yes">Sunrise</property>
+                <property name="sensitive" bind-source="manual_schedule_switch" bind-property="active" bind-flags="sync-create"/>
+                <child>
+                  <object class="TimeChooser" id="schedule_sunrise_time_chooser">
+                    <property name="margin-top">12</property>
+                    <property name="margin-bottom">12</property>
+                    <property name="valign">center</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="AdwActionRow">
+                <property name="title" translatable="yes">Sunset</property>
+                <property name="sensitive" bind-source="manual_schedule_switch" bind-property="active" bind-flags="sync-create"/>
+                <child>
+                  <object class="TimeChooser" id="schedule_sunset_time_chooser">
+                    <property name="margin-top">12</property>
+                    <property name="margin-bottom">12</property>
+                    <property name="valign">center</property>
+                  </object>
+                </child>
               </object>
             </child>
           </object>