diff --git a/app/components/component-formbuilder/src/components/FormBuilderLayout.js b/app/components/component-formbuilder/src/components/FormBuilderLayout.js
index 055426023f2cdf4b5e424c24e2ed21a12f09d841..6e4b10c9bc7cd298bc8955ff637f6e2f7dd61754 100644
--- a/app/components/component-formbuilder/src/components/FormBuilderLayout.js
+++ b/app/components/component-formbuilder/src/components/FormBuilderLayout.js
@@ -53,6 +53,7 @@ const FormBuilderLayout = ({
           key="delete-form"
           onClick={e => {
             e.preventDefault()
+            e.stopPropagation()
             deleteForm({
               variables: { formId: form.id },
             })
@@ -93,7 +94,8 @@ const FormBuilderLayout = ({
       <Columns>
         <Form>
           <Tabs
-            activeKey={`${activeFormId}`}
+            activeKey={activeFormId ?? 'new'}
+            key={activeFormId}
             onChange={tab => {
               setActiveFormId(tab)
               setActiveFieldId(null)
diff --git a/app/components/component-formbuilder/src/components/FormBuilderPage.js b/app/components/component-formbuilder/src/components/FormBuilderPage.js
index fa572c124f3e5b8f05f10275756e736f3fc9d70c..14185d73fd6d99d621b9b2a5148a62053cac3d64 100644
--- a/app/components/component-formbuilder/src/components/FormBuilderPage.js
+++ b/app/components/component-formbuilder/src/components/FormBuilderPage.js
@@ -69,7 +69,7 @@ const FormBuilderPage = () => {
   useEffect(() => {
     if (!loading && data) {
       if (data.getForms.length) {
-        setActiveFormId(data.getForms[0].id)
+        setActiveFormId(prevFormId => prevFormId ?? data.getForms[0].id)
       } else {
         setActiveFormId('new')
       }