diff --git a/src/components/Dashboard/Modals/EditService/EditServiceModal.tsx b/src/components/Dashboard/Modals/EditService/EditServiceModal.tsx
index 2edea1680..063f0a53b 100644
--- a/src/components/Dashboard/Modals/EditService/EditServiceModal.tsx
+++ b/src/components/Dashboard/Modals/EditService/EditServiceModal.tsx
@@ -61,8 +61,6 @@ export const EditServiceModal = ({
   });
 
   const onSubmit = (values: ServiceType) => {
-    console.log(values);
-
     if (!configName) {
       return;
     }
@@ -71,6 +69,9 @@ export const EditServiceModal = ({
       ...previousConfig,
       services: [...previousConfig.services.filter((x) => x.id !== form.values.id), form.values],
     }));
+
+    // also close the parent modal
+    context.closeAll();
   };
 
   const [activeTab, setActiveTab] = useState<EditServiceModalTab>('general');
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index ff22d4530..18ad03e37 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -77,13 +77,13 @@ function App(this: any, props: AppProps & { colorScheme: ColorScheme }) {
               withNormalizeCSS
             >
               <NotificationsProvider limit={4} position="bottom-left">
-                <ModalsProvider
-                  modals={{ editService: EditServiceModal, selectElement: SelectElementModal }}
-                >
-                  <ConfigProvider>
+                <ConfigProvider>
+                  <ModalsProvider
+                    modals={{ editService: EditServiceModal, selectElement: SelectElementModal }}
+                  >
                     <Component {...pageProps} />
-                  </ConfigProvider>
-                </ModalsProvider>
+                  </ModalsProvider>
+                </ConfigProvider>
               </NotificationsProvider>
             </MantineProvider>
           </ColorTheme.Provider>