diff --git a/data/config_window.ui b/data/config_window.ui
index c578022..ef9f38c 100644
--- a/data/config_window.ui
+++ b/data/config_window.ui
@@ -36,6 +36,16 @@
         <property name="can_focus">False</property>
         <property name="spacing">12</property>
         <property name="show_close_button">True</property>
+        <child>
+          <object class="GtkSwitch" id="switch_daemon_enabled">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="tooltip_text" translatable="yes">Enable/disable Mailnag daemon</property>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
         <child type="title">
           <object class="GtkStackSwitcher">
             <property name="visible">True</property>
@@ -59,6 +69,7 @@
           </object>
           <packing>
             <property name="pack_type">end</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
@@ -242,32 +253,6 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkSwitch" id="switch_daemon_enabled">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="tooltip_text" translatable="yes">Enable/disable Mailnag daemon</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="padding">6</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSeparator">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkLinkButton">
             <property name="label" translatable="yes">Donate</property>