diff --git a/frontend/src/app-components/dialogs/FormDialog.tsx b/frontend/src/app-components/dialogs/FormDialog.tsx
index 20469895..8ca2e749 100644
--- a/frontend/src/app-components/dialogs/FormDialog.tsx
+++ b/frontend/src/app-components/dialogs/FormDialog.tsx
@@ -32,7 +32,7 @@ export const FormDialog = ({
     );
 
   return (
-    <Dialog fullWidth {...rest}>
+    <Dialog open={!!rest?.open} fullWidth {...rest}>
       <DialogTitle onClose={onCancel}>{title}</DialogTitle>
       <DialogContent>{children}</DialogContent>
       {dialogActions}
diff --git a/frontend/src/components/inbox/components/AttachmentViewerForm.tsx b/frontend/src/components/inbox/components/AttachmentViewerForm.tsx
index 73a87578..de97482a 100644
--- a/frontend/src/components/inbox/components/AttachmentViewerForm.tsx
+++ b/frontend/src/components/inbox/components/AttachmentViewerForm.tsx
@@ -20,7 +20,7 @@ export const AttachmentViewerForm: FC<
   ComponentFormProps<AttachmentViewerFormData>
 > = ({ data, Wrapper = Fragment, WrapperProps }) => {
   return (
-    <Wrapper open={!!WrapperProps?.open} {...WrapperProps}>
+    <Wrapper {...WrapperProps}>
       {/* eslint-disable-next-line @next/next/no-img-element */}
       <img
         width="auto"
diff --git a/frontend/src/components/visual-editor/BlockEditForm.tsx b/frontend/src/components/visual-editor/BlockEditForm.tsx
index 87d35cca..9a162ee3 100644
--- a/frontend/src/components/visual-editor/BlockEditForm.tsx
+++ b/frontend/src/components/visual-editor/BlockEditForm.tsx
@@ -109,11 +109,7 @@ export const BlockEditForm: FC<ComponentFormProps<IBlock>> = ({
   }, [block, reset]);
 
   return (
-    <Wrapper
-      open={!!WrapperProps?.open}
-      onSubmit={handleSubmit(onSubmitForm)}
-      {...WrapperProps}
-    >
+    <Wrapper onSubmit={handleSubmit(onSubmitForm)} {...WrapperProps}>
       <BlockFormProvider methods={methods} block={block || undefined}>
         <ContentContainer>
           <ContentItem display="flex" gap={5}>
diff --git a/frontend/src/components/visual-editor/BlockMoveForm.tsx b/frontend/src/components/visual-editor/BlockMoveForm.tsx
index 67da9f3d..53443576 100644
--- a/frontend/src/components/visual-editor/BlockMoveForm.tsx
+++ b/frontend/src/components/visual-editor/BlockMoveForm.tsx
@@ -39,7 +39,6 @@ export const BlockMoveForm: FC<ComponentFormProps<BlockMoveFormData>> = ({
 
   return (
     <Wrapper
-      open={!!WrapperProps?.open}
       onSubmit={handleMove}
       {...WrapperProps}
       confirmButtonProps={{