diff --git a/src/main-window.ui b/src/main-window.ui
index efc50d8..2867a62 100644
--- a/src/main-window.ui
+++ b/src/main-window.ui
@@ -23,6 +23,7 @@
   <template class="RosterWindow" parent="AdwApplicationWindow">
     <property name="default-width">1200</property>
     <property name="default-height">800</property>
+    <property name="width-request">400</property>
     <property name="content">
       <object class="AdwToastOverlay" id="toast_overlay">
         <property name="child">
@@ -145,6 +146,13 @@
                       </object>
                     </child>
 
+                    <!-- Window controls: separate end child so it's always rightmost -->
+                    <child type="end">
+                      <object class="GtkWindowControls">
+                        <property name="side">end</property>
+                      </object>
+                    </child>
+
                     <!-- Right side buttons -->
                     <child type="end">
                       <object class="GtkBox">
@@ -166,11 +174,6 @@
                             <property name="menu-model">primary_menu</property>
                           </object>
                         </child>
-                        <child>
-                          <object class="GtkWindowControls">
-                            <property name="side">end</property>
-                          </object>
-                        </child>
                       </object>
                     </child>
                   </object>