1 files changed, 15 insertions, 5 deletions
diff --git a/src/resources/ui/nautilus-window.ui b/src/resources/ui/nautilus-window.ui
index 31afae73a..1af126399 100644
--- a/src/resources/ui/nautilus-window.ui
+++ b/src/resources/ui/nautilus-window.ui
@@ -38,6 +38,8 @@
     </section>
   </menu>
   <template class="NautilusWindow" parent="AdwApplicationWindow">
+    <property name="width-request">360</property>
+    <property name="height-request">380</property>
     <property name="show-menubar">False</property>
     <property name="title" translatable="yes">_Files</property>
     <child>
@@ -47,15 +49,15 @@
             <property name="orientation">vertical</property>
             <child>
               <object class="NautilusToolbar" id="toolbar">
-                <property name="show-sidebar-button" bind-source="content_flap" bind-property="folded" bind-flags="sync-create"/>
+                <property name="show-toolbar-children">True</property>
                 <property name="sidebar-button-active" bind-source="content_flap" bind-property="reveal-flap" bind-flags="bidirectional|sync-create"/>
-                <property name="show-toolbar-children" bind-source="content_flap" bind-property="folded" bind-flags="sync-create|invert-boolean"/>
                 <property name="window-slot" bind-source="NautilusWindow" bind-property="active-slot" bind-flags="sync-create"/>
               </object>
             </child>
             <child>
               <object class="AdwFlap" id="content_flap">
                 <property name="swipe-to-close" bind-source="content_flap" bind-property="folded" bind-flags="sync-create"/>
+                <property name="fold-policy">never</property>
                 <child type="flap">
                   <object class="NautilusGtkPlacesSidebar" id="places_sidebar">
                     <property name="vexpand">True</property>
@@ -73,7 +75,6 @@
                 <child>
                   <object class="GtkBox">
                     <property name="orientation">vertical</property>
-                    <property name="width-request">360</property>
                     <child>
                       <object class="AdwTabBar" id="tab_bar">
                         <property name="view">tab_view</property>
@@ -89,8 +90,8 @@
               </object>
             </child>
             <child>
-              <object class="GtkActionBar">
-                <property name="revealed" bind-source="content_flap" bind-property="folded" bind-flags="sync-create"/>
+              <object class="GtkActionBar" id="action_bar">
+                <property name="revealed">False</property>
                 <child type="start">
                   <object class="NautilusHistoryControls">
                     <property name="window-slot" bind-source="NautilusWindow" bind-property="active-slot" bind-flags="sync-create"/>
@@ -115,5 +116,14 @@
         </property>
       </object>
     </child>
+    <child>
+      <object class="AdwAdaptiveState" id="narrow_state">
+        <condition type="max-width">600</condition>
+        <setter object="content_flap" property="fold-policy">always</setter>
+        <setter object="toolbar" property="show-sidebar-button">True</setter>
+        <setter object="toolbar" property="show-toolbar-children">False</setter>
+        <setter object="action_bar" property="revealed">True</setter>
+      </object>
+    </child>
   </template>
 </interface>