diff --git a/services/frontend/src/components/FormModal.tsx b/services/frontend/src/components/FormModal.tsx
index ed8ff8f..e044a31 100644
--- a/services/frontend/src/components/FormModal.tsx
+++ b/services/frontend/src/components/FormModal.tsx
@@ -75,11 +75,10 @@ const FormModal = (props: IFormModalProps) => {
 
   const handleCreate = useCallback(
     (values: any, formik: any) => {
-      onCreate(getFinalValues(values, selectedNode), values, formik);
       formik.resetForm();
-      onHide();
+      onCreate(getFinalValues(values, selectedNode), values, formik);
     },
-    [getFinalValues, onCreate, onHide]
+    [getFinalValues, onCreate]
   );
 
   const renderTab = (tab: ITab) => {
diff --git a/services/frontend/src/components/modals/docker-compose/service/Create.tsx b/services/frontend/src/components/modals/docker-compose/service/Create.tsx
index 88750b7..7e528c8 100644
--- a/services/frontend/src/components/modals/docker-compose/service/Create.tsx
+++ b/services/frontend/src/components/modals/docker-compose/service/Create.tsx
@@ -23,6 +23,7 @@ const CreateServiceModal = (props: IModalServiceProps) => {
 
   const handleCreate = useCallback(
     (finalValues: IServiceNodeItem, values: IEditServiceForm) => {
+      onHide();
       onAddEndpoint(finalValues);
       toaster(
         `Created "${values.serviceName}" service successfully`,