diff --git a/src/pages/menu/manage-menu/blocks/AddDIalog.tsx b/src/pages/menu/manage-menu/blocks/AddDIalog.tsx
index 43b6aae..70d2f69 100644
--- a/src/pages/menu/manage-menu/blocks/AddDIalog.tsx
+++ b/src/pages/menu/manage-menu/blocks/AddDIalog.tsx
@@ -51,13 +51,14 @@ const AddDialog = () => {
     setIsSubmitting(true);
 
     if (
-      formField.module === '' ||
-      formField.name === '' ||
-      formField.link === '' ||
+      formField.module.trim() === '' ||
+      formField.name.trim() === '' ||
+      formField.link.trim() === '' ||
       formField.order_number === 0 ||
-      formField.status === ''
+      formField.status.trim() === ''
     ) {
       setAlert({ show: true, message: 'Please fill in all required fields.' });
+      setIsSubmitting(false);
       return;
     }
 
@@ -89,16 +90,24 @@ const AddDialog = () => {
     setAlert({ show: false, message: '' });
   };
 
+  const handleAddDialogChange = (open: boolean) => {
+    handleAddDialog(open);
+
+    if(!open) {
+      resetForm();
+    }
+  }
+
   const resetForm = () => {
     setFormField({
       ...initialState,
-      status: formField.status // Pertahankan nilai status terpilih
+      status: formField.status
     });
     setAlert({ show: false, message: '' });
   };
 
   return (
-    <Dialog open={showAddDialog} onOpenChange={(open) => handleAddDialog(open)}>
+    <Dialog open={showAddDialog} onOpenChange={handleAddDialogChange}>
       <DialogContent className="container-fixed max-w-[768px] flex flex-col p-5 overflow-hidden">
         <DialogHeader>
           <DialogTitle>Menu - Create</DialogTitle>