diff --git a/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/OptionTabs/EditTab/EditManualOptionsWithEditor/EditManualOptionsWithEditor.tsx b/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/OptionTabs/EditTab/EditManualOptionsWithEditor/EditManualOptionsWithEditor.tsx
index 022154d1424..7b3659e2bef 100644
--- a/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/OptionTabs/EditTab/EditManualOptionsWithEditor/EditManualOptionsWithEditor.tsx
+++ b/frontend/packages/ux-editor/src/components/config/editModal/EditOptions/OptionTabs/EditTab/EditManualOptionsWithEditor/EditManualOptionsWithEditor.tsx
@@ -32,7 +32,11 @@ export function EditManualOptionsWithEditor({
   };
 
   const handleClose = () => {
-    setChosenOption(true);
+    if (component.options !== undefined) {
+      setChosenOption(true);
+    }
+
+    manualOptionsModalRef.current?.close();
   };
 
   return (