diff --git a/crates/fj-kernel/src/shape/stores.rs b/crates/fj-kernel/src/shape/stores.rs
index 69c00c8aa..f69a2f66f 100644
--- a/crates/fj-kernel/src/shape/stores.rs
+++ b/crates/fj-kernel/src/shape/stores.rs
@@ -214,7 +214,10 @@ where
     T: fmt::Debug,
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_tuple("Handle").field(&self.get()).finish()
+        f.debug_struct("Handle")
+            .field("shape", &self.store.label.as_deref().unwrap_or("unnamed"))
+            .field("object", &self.get())
+            .finish()
     }
 }