diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
index 235ed9548cae..b79681bfe7f6 100644
--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
@@ -109,7 +109,7 @@ const ContentEditable = ({
     // Issue: <button> with contentEditable does not allow pressing space.
     // Solution: Add space on space keydown.
     const abortController = new AbortController();
-    if (rootElement.tagName === "BUTTON") {
+    if (rootElement.closest("button")) {
       rootElement.addEventListener(
         "keydown",
         (event) => {