diff --git a/src/components/confirm_modal/confirm_modal.js b/src/components/confirm_modal/confirm_modal.js
index 96ddc118f..3e2bc2cb7 100644
--- a/src/components/confirm_modal/confirm_modal.js
+++ b/src/components/confirm_modal/confirm_modal.js
@@ -22,6 +22,7 @@ const ConfirmModal = {
       type: String
     }
   },
+  emits: ['cancelled', 'accepted'],
   computed: {
   },
   methods: {
diff --git a/src/components/confirm_modal/confirm_modal.vue b/src/components/confirm_modal/confirm_modal.vue
index 3b98174aa..9af00edc4 100644
--- a/src/components/confirm_modal/confirm_modal.vue
+++ b/src/components/confirm_modal/confirm_modal.vue
@@ -1,8 +1,8 @@
 <template>
-  <dialog-modal
+  <DialogModal
     v-body-scroll-lock="true"
     class="confirm-modal"
-    :on-cancel="onCancel"
+    @cancel="onCancel"
   >
     <template #header>
       <span v-text="title" />
@@ -23,7 +23,7 @@
         v-text="cancelText"
       />
     </template>
-  </dialog-modal>
+  </DialogModal>
 </template>
 
 <script src="./confirm_modal.js"></script>
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index 015c90d85..b4677fe7f 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -170,7 +170,7 @@ const SettingsModal = {
   },
   computed: {
     ...mapState(useInterfaceStore, {
-      temporaryChangesTimeoutId: store => store.layoutType === 'mobile',
+      temporaryChangesTimeoutId: store => store.temporaryChangesTimeoutId,
       currentSaveStateNotice: store => store.settings.currentSaveStateNotice,
       modalActivated: store => store.settingsModalState !== 'hidden',
       modalMode: store => store.settingsModalMode,