diff --git a/src/components/common/VnForm.vue b/src/components/common/VnForm.vue
index 6df7c4da..418b8022 100644
--- a/src/components/common/VnForm.vue
+++ b/src/components/common/VnForm.vue
@@ -184,7 +184,6 @@ defineExpose({
             v-if="!loading"
             ref="addressFormRef"
             class="column full-width q-gutter-y-xs"
-            @submit="submit()"
         >
             <span class="text-h6 text-bold">
                 {{ title }}
@@ -208,12 +207,12 @@ defineExpose({
                 <QBtn
                     v-if="defaultActions"
                     :label="t('save')"
-                    type="submit"
                     :icon="showBottomActions ? undefined : 'check'"
                     rounded
                     no-caps
                     flat
                     :disabled="!showBottomActions && !updatedColumns.length"
+                    @click="submit()"
                 />
                 <slot name="actions" />
             </component>
diff --git a/src/stores/app.js b/src/stores/app.js
index 6ef90e26..60af8c8e 100644
--- a/src/stores/app.js
+++ b/src/stores/app.js
@@ -11,7 +11,8 @@ export const useAppStore = defineStore('hedera', {
         imageUrl: '',
         useRightDrawer: false,
         rightDrawerOpen: false,
-        basketOrderId: null
+        basketOrderId: null,
+        isHeaderMounted: false
     }),
 
     actions: {