diff --git a/data/gtk/window.ui b/data/gtk/window.ui
index b987339..1f6215a 100644
--- a/data/gtk/window.ui
+++ b/data/gtk/window.ui
@@ -85,6 +85,11 @@
             <lookup name="fullscreened">LpWindow</lookup>
             <lookup name="active">properties_button</lookup>
             <lookup name="active">primary_menu</lookup>
+            <lookup name="image">
+              <lookup name="current-page">
+                image_view
+              </lookup>
+            </lookup>
           </closure>
         </binding>
         <binding name="extend-content-to-top-edge">
diff --git a/src/window.rs b/src/window.rs
index de3844e..d909296 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -966,8 +966,10 @@ impl LpWindow {
         fullscreened: bool,
         show_properties: bool,
         show_menu: bool,
+        current_image: Option<LpImage>,
     ) -> adw::ToolbarStyle {
-        if self.extend_to_top(fullscreened, show_properties, show_menu) {
+        // Flat headerbar for empty state and fullscreen
+        if current_image.is_none() || self.extend_to_top(fullscreened, show_properties, show_menu) {
             adw::ToolbarStyle::Flat
         } else {
             // Use the border variant of raised to avoid shadows over images