diff --git a/resources/js_vue3/layouts/Footer.vue b/resources/js_vue3/layouts/Footer.vue
index 9dc1b717..4a6d9f75 100644
--- a/resources/js_vue3/layouts/Footer.vue
+++ b/resources/js_vue3/layouts/Footer.vue
@@ -1,24 +1,19 @@
 <script setup>
     import { useAppSettingsStore } from '@/stores/appSettings'
     import { useUserStore } from '@/stores/user'
-    import { useBusStore } from '@/stores/bus'
 
     const appSettings = useAppSettingsStore()
     const user = useUserStore()
-    const bus = useBusStore()
     const $2fauth = inject('2fauth')
 
     const props = defineProps({
-        showButtons: true
+        showButtons: true,
+        internalFooterType: {
+            type: String,
+            default: 'navLinks'
+        }
     })
 
-    const emit = defineEmits(['management-mode-exited'])
-
-    function exitManagementMode() {
-        bus.inManagementMode = false
-        emit('management-mode-exited')
-    }
-
     function logout() {
         if(confirm(trans('auth.confirm.logout'))) {
             user.logout()
@@ -35,8 +30,8 @@
                 </div>
             </div>
         </div>
-        <div v-if="bus.inManagementMode" class="content has-text-centered">
-            <button id="lnkExitEdit" class="button is-ghost is-like-text" @click="exitManagementMode">{{ $t('commons.done') }}</button>
+        <div v-if="internalFooterType == 'doneButton'" class="content has-text-centered">
+            <button id="lnkExitEdit" class="button is-ghost is-like-text" @click.stop="$emit('doneButtonClicked', true)">{{ $t('commons.done') }}</button>
         </div>
         <div v-else class="content has-text-centered">
             <div v-if="$route.meta.showAbout === true" class="is-size-6">
diff --git a/resources/js_vue3/views/twofaccounts/Accounts.vue b/resources/js_vue3/views/twofaccounts/Accounts.vue
index 3ad7aeaf..6b37e2d5 100644
--- a/resources/js_vue3/views/twofaccounts/Accounts.vue
+++ b/resources/js_vue3/views/twofaccounts/Accounts.vue
@@ -217,6 +217,15 @@
         }
     }
 
+    /**
+     * Exits from the Management mode
+     */
+    function exitManagementMode()
+    {
+        bus.inManagementMode = false
+        twofaccounts.selectNone()
+    }
+
 </script>
 
 <template>
@@ -344,7 +353,7 @@
                     </div>
                 </span>
             </div>
-            <VueFooter :showButtons="true" v-on:management-mode-exited="twofaccounts.selectNone()">
+            <VueFooter :showButtons="true" :internalFooterType="bus.inManagementMode && !showDestinationGroupSelector ? 'doneButton' : 'navLinks'" @done-button-clicked="exitManagementMode">
                 <ActionButtons
                     v-model:inManagementMode="bus.inManagementMode"
                     :areDisabled="twofaccounts.hasNoneSelected"