diff --git a/ui/src/layout/components_side/Macros/SettingsMacrosEdit.tsx b/ui/src/layout/components_side/Macros/SettingsMacrosEdit.tsx
index 535ea0a..fc13003 100644
--- a/ui/src/layout/components_side/Macros/SettingsMacrosEdit.tsx
+++ b/ui/src/layout/components_side/Macros/SettingsMacrosEdit.tsx
@@ -117,16 +117,17 @@ const SettingsMacrosEdit: React.FC<MenuComponentProps> = ({ onMenuSelect,macroId
   disabled={isDeleting}
   />
   </div>
-  <MacroForm
-  initialData={macro}
-  onSubmit={handleUpdateMacro}
-  onCancel={() => {
-    console.log("MacroForm onCancel")
-    onMenuSelect("index");
-  }}
-  isSubmitting={isUpdating}
-
-  />
+  <div onKeyUp={e => e.stopPropagation()} onKeyDown={e => e.stopPropagation()}>
+    <MacroForm
+      initialData={macro}
+      onSubmit={handleUpdateMacro}
+      onCancel={() => {
+        console.log("MacroForm onCancel")
+        onMenuSelect("index");
+      }}
+      isSubmitting={isUpdating}
+    />
+  </div>
 
   <ConfirmDialog
     open={showDeleteConfirm}
@@ -145,4 +146,4 @@ const SettingsMacrosEdit: React.FC<MenuComponentProps> = ({ onMenuSelect,macroId
   </div>
 );
 }
-export default SettingsMacrosEdit;
\ No newline at end of file
+export default SettingsMacrosEdit;