diff --git a/src/backend/kms/surface/timings.rs b/src/backend/kms/surface/timings.rs
index 5d0f0694..48cdbf7f 100644
--- a/src/backend/kms/surface/timings.rs
+++ b/src/backend/kms/surface/timings.rs
@@ -99,6 +99,10 @@ impl Timings {
         self.vrr = vrr;
     }
 
+    pub fn vrr(&self) -> bool {
+        self.vrr
+    }
+
     pub fn start_render(&mut self, clock: &Clock<Monotonic>) {
         self.pending_frame = Some(PendingFrame {
             render_start: clock.now(),
diff --git a/src/debug.rs b/src/debug.rs
index 812eef46..989bee6a 100644
--- a/src/debug.rs
+++ b/src/debug.rs
@@ -161,6 +161,7 @@ pub fn fps_ui<'a>(
                                 }
                             });
                         }
+                        ui.label(egui::RichText::new(format!("VRR: {}", timings.vrr())).code());
                         ui.label(egui::RichText::new(format!("FPS: {:>7.3}", avg_fps)).heading());
                         ui.label("Render Times:");
                         ui.label(egui::RichText::new(format!("avg: {:>7.6}", avg)).code());
diff --git a/src/shell/element/mod.rs b/src/shell/element/mod.rs
index 948a0c72..1b003818 100644
--- a/src/shell/element/mod.rs
+++ b/src/shell/element/mod.rs
@@ -656,8 +656,11 @@ impl CosmicMapped {
         let mut elements = if let Some(debug) = self.debug.lock().unwrap().as_mut() {
             let window = self.active_window();
             let window_geo = window.geometry();
-            let (min_size, max_size, size) =
-                (window.min_size(), window.max_size(), window.geometry().size);
+            let (min_size, max_size, size) = (
+                window.min_size_without_ssd(),
+                window.max_size_without_ssd(),
+                window.geometry().size,
+            );
 
             let area = Rectangle::<i32, Logical>::from_loc_and_size(
                 location.to_f64().to_logical(scale).to_i32_round(),