diff --git a/src/adw-adaptive-preview.c b/src/adw-adaptive-preview.c
index 9599eb190871b28621b7526fcd39d3a0162290be..ec64d9e0a96242f4ef8bbf2dc264345bccff1a03 100644
--- a/src/adw-adaptive-preview.c
+++ b/src/adw-adaptive-preview.c
@@ -361,6 +361,8 @@ allocate_screen_view (GtkWidget *widget,
     int child_width, child_height, available_height;
     GskTransform *transform;
 
+    available_height = height - top_bar_height - bottom_bar_height;
+
     if (gtk_widget_get_request_mode (self->child_bin) == GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH) {
       gtk_widget_measure (self->child_bin, GTK_ORIENTATION_HORIZONTAL, -1,
                           &child_width, NULL, NULL, NULL);
@@ -373,8 +375,6 @@ allocate_screen_view (GtkWidget *widget,
                           &child_height, NULL, NULL, NULL);
     }
 
-    available_height = height - top_bar_height - bottom_bar_height;
-
     if (child_width > width || child_height > available_height) {
       g_warning ("Window contents don't fit: provided %d×%d, available %d×%d",
                  child_width, child_height, width, available_height);
diff --git a/src/adw-adaptive-preview.ui b/src/adw-adaptive-preview.ui
index 49a33d7407a91fd5ba976048e491906170a624f0..f6f1fdd6708d7e2e8dc9c899c07200f78e0b9ea3 100644
--- a/src/adw-adaptive-preview.ui
+++ b/src/adw-adaptive-preview.ui
@@ -58,6 +58,7 @@
                           <object class="GtkButton">
                             <property name="label" translatable="yes">Rotate Left</property>
                             <property name="icon-name">object-rotate-left-symbolic</property>
+                            <property name="tooltip-text" translatable="yes">Rotate Left</property>
                             <property name="valign">center</property>
                             <signal name="clicked" handler="rotate_left_cb" swapped="yes"/>
                             <style>
@@ -69,6 +70,7 @@
                           <object class="GtkButton">
                             <property name="label" translatable="yes">Rotate Right</property>
                             <property name="icon-name">object-rotate-right-symbolic</property>
+                            <property name="tooltip-text" translatable="yes">Rotate Right</property>
                             <property name="valign">center</property>
                             <signal name="clicked" handler="rotate_right_cb" swapped="yes"/>
                             <style>
@@ -141,10 +143,23 @@
           </object>
         </property>
         <property name="content">
-          <object class="AdwToolbarView">
-            <child type="top">
+          <!-- Intentionally not using AdwToolbarView so we don't add
+               undershoots to the window content by accident -->
+          <object class="GtkBox">
+            <property name="orientation">vertical</property>
+            <child>
               <object class="AdwHeaderBar">
                 <property name="show-title">False</property>
+                <style>
+                  <class name="adaptive-mode-flat"/>
+                </style>
+                <child type="start">
+                  <object class="GtkToggleButton">
+                    <property name="icon-name">sidebar-show-symbolic</property>
+                    <property name="tooltip-text" translatable="yes">Toggle Sidebar</property>
+                    <property name="active" bind-source="content" bind-property="show-sidebar" bind-flags="sync-create|bidirectional"/>
+                  </object>
+                </child>
                 <child type="end">
                   <object class="GtkButton">
                     <signal name="clicked" handler="exit_clicked_cb" swapped="yes"/>
@@ -158,8 +173,12 @@
                 </child>
               </object>
             </child>
-            <property name="content">
+            <child>
               <object class="GtkScrolledWindow">
+                <property name="vexpand">True</property>
+                <style>
+                  <class name="undershoot-top"/>
+                </style>
                 <property name="child">
                   <object class="AdwGizmo" id="scale_bin">
                     <property name="margin-top">24</property>
@@ -202,7 +221,7 @@
                   </object>
                 </property>
               </object>
-            </property>
+            </child>
           </object>
         </property>
       </object>
diff --git a/src/stylesheet/widgets/_inspector.scss b/src/stylesheet/widgets/_inspector.scss
index 0fd8274e31be34af0f6b498802b28292ac65716a..abfd2817a1bdfc79acd2423c11af299346aacb9e 100644
--- a/src/stylesheet/widgets/_inspector.scss
+++ b/src/stylesheet/widgets/_inspector.scss
@@ -12,6 +12,10 @@ adaptive-preview {
   background: var(--overview-bg-color);
   color: var(--overview-fg-color);
 
+  headerbar.adaptive-mode-flat {
+    @extend .flat;
+  }
+
   .screen-view {
     box-shadow: 0 2px 8px 2px RGB(0 0 0 / 7%),
                 0 3px 20px 10px RGB(0 0 0 / 5%),