diff --git a/text2sql-frontend/src/components/Connection/ConnectionEditor.tsx b/text2sql-frontend/src/components/Connection/ConnectionEditor.tsx
index d8d07adc..d85851b7 100644
--- a/text2sql-frontend/src/components/Connection/ConnectionEditor.tsx
+++ b/text2sql-frontend/src/components/Connection/ConnectionEditor.tsx
@@ -86,20 +86,18 @@ export const ConnectionEditor = () => {
     fetchConnection();
   }, [params.connectionId]);
 
-  function handleDelete() {
-    (async () => {
-      try {
-        await api.deleteConnection(params.connectionId!);
-        fetchConnections();
-        fetchConversations();
-        navigate(Routes.Root);
-      } catch (exception) {
-        enqueueSnackbar({
-          variant: "error",
-          message: "Error deleting connection",
-        });
-      }
-    })();
+  async function handleDelete() {
+    try {
+      await api.deleteConnection(params.connectionId!);
+      fetchConnections();
+      fetchConversations();
+      navigate(Routes.Root);
+    } catch (exception) {
+      enqueueSnackbar({
+        variant: "error",
+        message: "Error deleting connection",
+      });
+    }
   }
   function handleSubmit() {
     if (!unsavedChanges) {
@@ -214,6 +212,7 @@ export const ConnectionEditor = () => {
 
           <form className="sm:col-span-6 flex items-center justify-end gap-x-6">
             <button
+              type="button"
               onClick={handleDelete}
               className="rounded-md bg-gray-700 hover:bg-red-700 px-3 py-2 text-sm font-medium text-red-500 hover:text-white border border-gray-600 hover:border-red-600 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-600 transition-colors duration-150"
             >
@@ -221,6 +220,7 @@ export const ConnectionEditor = () => {
             </button>
             <button
               type="button"
+              onClick={handleBack}
               className="rounded-md bg-gray-600 px-3 py-2 text-sm font-medium text-white border border-gray-500 hover:bg-gray-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-600 transition-colors duration-150"
             >
               Cancel