diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 1c4fafb26898ec0ed05ed1ef9f5e98ce8b3fe3bd..aed6c55668a1143d1076e950bae4b328a3aca786 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -1218,9 +1218,11 @@ impl EditorElement {
                         popover_origin.x = popover_origin.x + x_out_of_bounds;
                     }
 
-                    cx.break_content_mask(|cx| {
-                        hover_popover.draw(popover_origin, available_space, cx)
-                    });
+                    if cx.was_top_layer(&popover_origin, cx.stacking_order()) {
+                        cx.break_content_mask(|cx| {
+                            hover_popover.draw(popover_origin, available_space, cx)
+                        });
+                    }
 
                     current_y = popover_origin.y - HOVER_POPOVER_GAP;
                 }