diff --git a/src/App.vue b/src/App.vue
index d74fab7606..8ca7ee5af5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -310,10 +310,11 @@
     </v-main>
   </v-app>
   <About v-if="showAboutDialog" @update:show-about-dialog="showAboutDialog = $event" />
-  <Tutorial v-if="interfaceStore.isTutorialVisible" />
   <VideoLibraryModal v-if="interfaceStore.isVideoLibraryVisible" />
-  <VehicleDiscoveryDialog v-model="showDiscoveryDialog" show-auto-search-option />
-  <UpdateNotification v-if="isElectron()" />
+  <Tutorial :model-value="interfaceStore.isTutorialVisible" />
+  <div v-if="WrappedDialog">
+    <component :is="WrappedDialog" />
+  </div>
   <SnackbarContainer />
 </template>
 
@@ -336,6 +337,7 @@ import Tutorial from '@/components/Tutorial.vue'
 import UpdateNotification from '@/components/UpdateNotification.vue'
 import VehicleDiscoveryDialog from '@/components/VehicleDiscoveryDialog.vue'
 import VideoLibraryModal from '@/components/VideoLibraryModal.vue'
+import { useDialogQueue } from '@/composables/dialogQueue'
 import { useInteractionDialog } from '@/composables/interactionDialog'
 import {
   availableCockpitActions,
@@ -366,6 +368,8 @@ import ConfigurationUIView from './views/ConfigurationUIView.vue'
 import ConfigurationVideoView from './views/ConfigurationVideoView.vue'
 import ToolsDataLakeView from './views/ToolsDataLakeView.vue'
 import ToolsMAVLinkView from './views/ToolsMAVLinkView.vue'
+
+const { enqueueDialog, WrappedDialog } = useDialogQueue()
 const { showDialog, closeDialog } = useInteractionDialog()
 const { openSnackbar } = useSnackbar()
 
@@ -760,23 +764,27 @@ onBeforeUnmount(() => {
 const currentTopBarHeightPixels = computed(() => `${widgetStore.currentTopBarHeightPixels}px`)
 const currentBottomBarHeightPixels = computed(() => `${widgetStore.currentBottomBarHeightPixels}px`)
 
-const showDiscoveryDialog = ref(false)
 const preventAutoSearch = useStorage('cockpit-prevent-auto-vehicle-discovery-dialog', false)
 
 onMounted(() => {
-  if (isElectron() && !preventAutoSearch.value) {
+  if (!interfaceStore.userHasSeenTutorial) {
+    enqueueDialog({
+      component: Tutorial,
+    })
+  }
+  if (isElectron()) {
+    enqueueDialog({
+      component: UpdateNotification,
+    })
     // Wait 5 seconds to check if we're connected to a vehicle
     setTimeout(() => {
-      if (vehicleStore.isVehicleOnline) return
-      showDiscoveryDialog.value = true
+      if (vehicleStore.isVehicleOnline || preventAutoSearch.value) return
+      enqueueDialog({
+        component: VehicleDiscoveryDialog,
+        props: { showAutoSearchOption: true },
+      })
     }, 5000)
   }
-
-  if (!interfaceStore.userHasSeenTutorial) {
-    setTimeout(() => {
-      interfaceStore.isTutorialVisible = true
-    }, 6000)
-  }
 })
 </script>
 
diff --git a/src/components/Tutorial.vue b/src/components/Tutorial.vue
index 354193dbd3..003af027d4 100644
--- a/src/components/Tutorial.vue
+++ b/src/components/Tutorial.vue
@@ -98,7 +98,18 @@ const { openSnackbar } = useSnackbar()
 const interfaceStore = useAppInterfaceStore()
 const vehicleStore = useMainVehicleStore()
 
-const showTutorial = ref(true)
+const props = defineProps<{
+  /**
+   * Parent-controlled trigger for showing the dialog.
+   */
+  modelValue: boolean
+}>()
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: boolean): void
+}>()
+
+const showTutorial = ref(false || props.modelValue)
 const currentTutorialStep = useStorage('cockpit-last-tutorial-step', 1)
 const isVehicleConnectedVisible = ref(false)
 const tallContent = ref(false)
@@ -199,14 +210,14 @@ const handleStepChange = (newStep: number): void => {
       interfaceStore.isMainMenuVisible = false
       interfaceStore.mainMenuCurrentStep = 1
       interfaceStore.componentToHighlight = 'none'
-      interfaceStore.currentSubMenuComponentName = null
+      interfaceStore.currentSubMenuComponentName = undefined
       interfaceStore.currentSubMenuName = null
       break
     case 2:
       interfaceStore.isMainMenuVisible = false
       interfaceStore.mainMenuCurrentStep = 1
       interfaceStore.componentToHighlight = 'menu-trigger'
-      interfaceStore.currentSubMenuComponentName = null
+      interfaceStore.currentSubMenuComponentName = undefined
       interfaceStore.currentSubMenuName = null
       interfaceStore.userHasSeenTutorial = false
       break
@@ -215,7 +226,7 @@ const handleStepChange = (newStep: number): void => {
       interfaceStore.mainMenuCurrentStep = 2
       interfaceStore.currentSubMenuName = SubMenuName.settings
       interfaceStore.componentToHighlight = 'settings-menu-item'
-      interfaceStore.currentSubMenuComponentName = null
+      interfaceStore.currentSubMenuComponentName = SubMenuComponentName.None
       interfaceStore.userHasSeenTutorial = false
       break
     case 4:
@@ -316,6 +327,7 @@ const handleStepChange = (newStep: number): void => {
 const dontShowTutorialAgain = (): void => {
   interfaceStore.userHasSeenTutorial = true
   showTutorial.value = false
+  emit('update:modelValue', false)
   currentTutorialStep.value = 1
   openSnackbar({
     message: 'This guide can be reopened via the Settings > General menu',
@@ -348,8 +360,8 @@ const backTutorialStep = (): void => {
 const closeTutorial = (): void => {
   showTutorial.value = false
   interfaceStore.componentToHighlight = 'none'
-  interfaceStore.userHasSeenTutorial = true
   interfaceStore.isTutorialVisible = false
+  emit('update:modelValue', false)
 }
 
 const setVehicleConnectedVisible = (): void => {
diff --git a/src/components/UpdateNotification.vue b/src/components/UpdateNotification.vue
index c795218567..5ba294defd 100644
--- a/src/components/UpdateNotification.vue
+++ b/src/components/UpdateNotification.vue
@@ -1,6 +1,6 @@
 <template>
   <InteractionDialog
-    v-model="showUpdateDialog"
+    :show-dialog="showUpdateDialog"
     :title="dialogTitle"
     :message="dialogMessage"
     :variant="dialogVariant"
@@ -27,17 +27,34 @@
         </template>
       </v-progress-linear>
     </template>
+    <template #actions>
+      <v-btn variant="text" size="small" @click="handleCloseDialog">Close</v-btn>
+    </template>
   </InteractionDialog>
 </template>
 
 <script setup lang="ts">
 import { useStorage } from '@vueuse/core'
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 
 import InteractionDialog, { type Action } from '@/components/InteractionDialog.vue'
+import { openSnackbar } from '@/composables/snackbar'
 import { app_version } from '@/libs/cosmos'
 import { isElectron } from '@/libs/utils'
 
+defineProps<{
+  /**
+   * Parent-controlled trigger for showing the dialog.
+   */
+  // eslint-disable-next-line vue/no-unused-properties
+  modelValue: boolean
+}>()
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: boolean): void
+}>()
+
+const updateAvailable = ref(false)
 const showUpdateDialog = ref(false)
 const dialogTitle = ref('')
 const dialogMessage = ref('')
@@ -52,6 +69,23 @@ const updateInfo = ref({
 })
 const ignoredUpdateVersions = useStorage<string[]>('cockpit-ignored-update-versions', [])
 
+// Wait for 2 seconds for updates. If no updates are available, show a message and emit close.
+onMounted(() => {
+  setTimeout(() => {
+    if (updateAvailable.value) {
+      showUpdateDialog.value = true
+    } else {
+      openSnackbar({ message: 'No updates available.', variant: 'success' })
+      emit('update:modelValue', false)
+    }
+  }, 2000)
+})
+
+const handleCloseDialog = (): void => {
+  emit('update:modelValue', false)
+  showUpdateDialog.value = false
+}
+
 const formatDate = (date: string): string => {
   return new Date(date).toLocaleDateString('en-US', { year: 'numeric', month: 'long', day: 'numeric' })
 }
@@ -75,7 +109,7 @@ onBeforeMount(() => {
     dialogVariant.value = 'info'
     dialogActions.value = []
     showProgress.value = false
-    showUpdateDialog.value = true
+    updateAvailable.value = true
   })
 
   window.electronAPI.onUpdateNotAvailable(() => {
@@ -87,11 +121,12 @@ onBeforeMount(() => {
       {
         text: 'OK',
         action: () => {
-          showUpdateDialog.value = false
+          handleCloseDialog()
         },
       },
     ]
     showProgress.value = false
+    updateAvailable.value = false
   })
 
   window.electronAPI.onUpdateAvailable((info) => {
@@ -107,7 +142,7 @@ onBeforeMount(() => {
           console.log(`User chose to ignore version ${updateInfo.value.version}`)
           ignoredUpdateVersions.value.push(updateInfo.value.version)
           window.electronAPI!.cancelUpdate()
-          showUpdateDialog.value = false
+          handleCloseDialog()
         },
       },
       {
@@ -121,7 +156,7 @@ onBeforeMount(() => {
               action: () => {
                 console.log('User chose to cancel the update for the Electron app.')
                 window.electronAPI!.cancelUpdate()
-                showUpdateDialog.value = false
+                handleCloseDialog()
                 dialogMessage.value = 'Downloading update...'
               },
             },
@@ -132,7 +167,7 @@ onBeforeMount(() => {
         text: 'Not Now',
         action: () => {
           window.electronAPI!.cancelUpdate()
-          showUpdateDialog.value = false
+          handleCloseDialog()
         },
       },
     ]
@@ -140,11 +175,12 @@ onBeforeMount(() => {
     // Check if this version is in the ignored list
     if (ignoredUpdateVersions.value.includes(info.version)) {
       console.log(`Skipping ignored version ${info.version}.`)
-      showUpdateDialog.value = false
+
+      handleCloseDialog()
       return
     }
 
-    showUpdateDialog.value = true
+    updateAvailable.value = true
   })
 
   window.electronAPI.onDownloadProgress((progressInfo) => {
@@ -171,11 +207,11 @@ onBeforeMount(() => {
         text: 'Later',
         action: () => {
           console.log('User chose to install the update for the Electron app later.')
-          showUpdateDialog.value = false
+          handleCloseDialog()
         },
       },
     ]
-    showUpdateDialog.value = true
+    updateAvailable.value = true
   })
 })
 </script>
diff --git a/src/composables/dialogQueue.ts b/src/composables/dialogQueue.ts
new file mode 100644
index 0000000000..39afdb6c12
--- /dev/null
+++ b/src/composables/dialogQueue.ts
@@ -0,0 +1,96 @@
+import { Component, computed, defineComponent, h, Ref, ref } from 'vue'
+
+/**
+ *  Queued component to be displayed. Usually a dialog.
+ */
+export interface QueuedDialog {
+  /**
+   * The component reference (e.g. Tutorial or VehicleDiscoveryDialog)
+   */
+  component: Component
+  /**
+   * Optional props to pass into the component
+   */
+  props?: Record<string, unknown>
+}
+
+/**
+ * Component queue to manage the order of components to be displayed.
+ */
+export interface DialogQueue {
+  /**
+   * Enqueue a dialog to be displayed.
+   */
+  enqueueDialog: (item: QueuedDialog) => void
+  /**
+   * Clear the queue.
+   */
+  clear: () => void
+  /**
+   * The queue itself.
+   */
+  queue: Ref<QueuedDialog[]>
+  /**
+   * The current dialog to be displayed.
+   */
+  currentDialog: Ref<QueuedDialog | null>
+  /**
+   * Whether the dialog is visible or not.
+   */
+  isDialogVisible: Ref<boolean>
+  /**
+   * The wrapped dialog component.
+   */
+  WrappedDialog: Ref<Component | null>
+}
+
+export const useDialogQueue = (): DialogQueue => {
+  const queue: Ref<QueuedDialog[]> = ref([])
+  const isDialogVisible: Ref<boolean> = ref(true)
+
+  const enqueueDialog = (item: QueuedDialog): void => {
+    queue.value.push(item)
+  }
+
+  const clear = (): void => {
+    queue.value = []
+  }
+
+  const currentDialog = computed(() => queue.value[0] || null)
+
+  const closeCurrentDialog = (): void => {
+    queue.value.shift()
+    isDialogVisible.value = true
+  }
+
+  const WrappedDialog = computed(() => {
+    if (!currentDialog.value) return null
+
+    return defineComponent({
+      name: 'WrappedDialog',
+      setup() {
+        const handleUpdate = (value: boolean): void => {
+          if (!value) {
+            closeCurrentDialog()
+          }
+        }
+
+        return () =>
+          h(currentDialog.value!.component, {
+            ...currentDialog.value!.props,
+            'modelValue': isDialogVisible.value,
+            'onUpdate:modelValue': handleUpdate,
+          })
+      },
+    })
+  })
+
+  return {
+    enqueueDialog,
+    clear,
+    queue,
+    currentDialog,
+    isDialogVisible,
+    WrappedDialog,
+  }
+}
diff --git a/src/stores/appInterface.ts b/src/stores/appInterface.ts
index f330e555eb..cfb2a5bdad 100644
--- a/src/stores/appInterface.ts
+++ b/src/stores/appInterface.ts
@@ -28,8 +28,10 @@ export enum SubMenuComponentName {
   SettingsDev = 'settings-dev',
   SettingsMission = 'settings-mission',
   SettingsActions = 'settings-actions',
+  SettingsDataLake = 'settings-datalake',
   ToolsMAVLink = 'tools-mavlink',
   ToolsDataLake = 'tools-datalake',
+  None = 'none',
 }
 
 export const useAppInterfaceStore = defineStore('responsive', {
@@ -50,7 +52,7 @@ export const useAppInterfaceStore = defineStore('responsive', {
     isMainMenuVisible: false,
     mainMenuCurrentStep: 1,
     currentSubMenuName: ref<SubMenuName | null>(null),
-    currentSubMenuComponentName: ref<SubMenuComponentName | null>(null),
+    currentSubMenuComponentName: ref<SubMenuComponentName | undefined>(undefined),
     isGlassModalAlwaysOnTop: false,
     isTutorialVisible: false,
     userHasSeenTutorial: useBlueOsStorage('cockpit-has-seen-tutorial', false),
diff --git a/src/types/general.ts b/src/types/general.ts
index 90c189aa60..f0216f9674 100644
--- a/src/types/general.ts
+++ b/src/types/general.ts
@@ -32,7 +32,7 @@ export interface DialogActions {
   disabled?: boolean
 }
 
-export type SubMenuComponent = DefineComponent<Record<string, never>, Record<string, never>, unknown> | null
+export type SubMenuComponent = DefineComponent<Record<string, never>, Record<string, never>, unknown> | undefined
 
 export interface StorageDB {
   getItem: (key: string) => Promise<Blob | null | undefined>
@@ -78,3 +78,28 @@ export interface ValidationFunctionReturn {
    */
   error?: string
 }
+
+/**
+ * Cockpit settings object
+ */
+export interface Settings {
+  [key: string]: any // eslint-disable-line @typescript-eslint/no-explicit-any
+}
+
+/**
+ * Config item for Cockpit settings
+ */
+export interface SettingItem {
+  /**
+   *
+   */
+  setting: string
+  /**
+   *
+   */
+  originalKey: string
+  /**
+   *
+   */
+  changed?: boolean
+}