diff --git a/src/main-window.ui b/src/main-window.ui
index 2f697ae..829d869 100644
--- a/src/main-window.ui
+++ b/src/main-window.ui
@@ -24,6 +24,20 @@
         <attribute name="action">win.import-http-file</attribute>
       </item>
     </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Preferences</attribute>
+        <attribute name="action">app.preferences</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
+        <attribute name="action">app.shortcuts</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_About Roster</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+    </section>
   </menu>
 
   <template class="RosterWindow" parent="AdwApplicationWindow">
@@ -61,6 +75,7 @@
                     </child>
                     <child type="end">
                       <object class="GtkMenuButton" id="sidebar_hamburger_button">
+                        <property name="primary">True</property>
                         <property name="icon-name">open-menu-symbolic</property>
                         <property name="tooltip-text">Menu</property>
                         <property name="menu-model">sidebar_menu</property>
@@ -151,25 +166,12 @@
 
                     <!-- Right side buttons -->
                     <child type="end">
-                      <object class="GtkBox">
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkButton" id="new_request_button">
-                            <property name="icon-name">list-add-symbolic</property>
-                            <property name="tooltip-text">New Request (Ctrl+T)</property>
-                            <style>
-                              <class name="flat"/>
-                            </style>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuButton">
-                            <property name="primary">True</property>
-                            <property name="icon-name">open-menu-symbolic</property>
-                            <property name="tooltip-text" translatable="yes">Main Menu</property>
-                            <property name="menu-model">primary_menu</property>
-                          </object>
-                        </child>
+                      <object class="GtkButton" id="new_request_button">
+                        <property name="icon-name">list-add-symbolic</property>
+                        <property name="tooltip-text">New Request (Ctrl+T)</property>
+                        <style>
+                          <class name="flat"/>
+                        </style>
                       </object>
                     </child>
                   </object>
@@ -266,20 +268,4 @@
     </child>
   </template>
 
-  <menu id="primary_menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Preferences</attribute>
-        <attribute name="action">app.preferences</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
-        <attribute name="action">app.shortcuts</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_About Roster</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
-    </section>
-  </menu>
 </interface>