diff --git a/data/resources/style.css b/data/resources/style.css
index b6e32808..fb4886f4 100644
--- a/data/resources/style.css
+++ b/data/resources/style.css
@@ -368,10 +368,7 @@ sidebar-row.drop-active.drop-empty .dim-label {
 }
 
 room-history-row {
-  padding-top: 6px;
-  padding-bottom: 6px;
-  padding-left: 8px;
-  padding-right: 8px;
+  padding: 3px 8px;
   border-radius: 6px;
   transition-property: outline, outline-width, outline-offset, outline-color;
   transition-duration: 300ms;
@@ -382,7 +379,7 @@ room-history-row {
 }
 
 room-history-row.has-header {
-  margin-top: 6px;
+  margin-top: 0;
 }
 
 room-history-row:not(.has-header) .event-content:dir(ltr),
diff --git a/src/session/view/content/room_history/mod.ui b/src/session/view/content/room_history/mod.ui
index cdbb38af..a8fb696b 100644
--- a/src/session/view/content/room_history/mod.ui
+++ b/src/session/view/content/room_history/mod.ui
@@ -151,22 +151,14 @@
                               <class name="undershoot-bottom"/>
                             </style>
                             <property name="child">
-                              <object class="AdwClampScrollable">
-                                <property name="vexpand">True</property>
-                                <property name="hexpand">True</property>
-                                <property name="maximum-size">750</property>
-                                <property name="tightening-threshold">550</property>
-                                <property name="child">
-                                  <object class="GtkListView" id="listview">
-                                    <style>
-                                      <class name="navigation-sidebar"/>
-                                    </style>
-                                    <property name="tab-behavior">item</property>
-                                    <accessibility>
-                                      <property name="label" translatable="yes">Room History</property>
-                                    </accessibility>
-                                  </object>
-                                </property>
+                              <object class="GtkListView" id="listview">
+                                <style>
+                                  <class name="navigation-sidebar"/>
+                                </style>
+                                <property name="tab-behavior">item</property>
+                                <accessibility>
+                                  <property name="label" translatable="yes">Room History</property>
+                                </accessibility>
                               </object>
                             </property>
                           </object>
@@ -178,15 +170,9 @@
               </object>
             </child>
             <child>
-              <object class="AdwClamp">
+              <object class="MessageToolbar" id="message_toolbar">
                 <property name="vexpand">False</property>
-                <property name="maximum-size">750</property>
-                <property name="tightening-threshold">550</property>
-                <child>
-                  <object class="MessageToolbar" id="message_toolbar">
-                    <property name="room" bind-source="ContentRoomHistory" bind-property="room" bind-flags="sync-create" />
-                  </object>
-                </child>
+                <property name="room" bind-source="ContentRoomHistory" bind-property="room" bind-flags="sync-create" />
               </object>
             </child>
           </object>