diff --git a/src/components/draft_closer/draft_closer.js b/src/components/draft_closer/draft_closer.js
index e5f827d7..e50ea05a 100644
--- a/src/components/draft_closer/draft_closer.js
+++ b/src/components/draft_closer/draft_closer.js
@@ -15,7 +15,11 @@ const DraftCloser = {
   ],
   computed: {
     action () {
-      return this.$store.getters.mergedConfig.unsavedPostAction
+      if (this.$store.getters.mergedConfig.autoSaveDraft) {
+        return 'save'
+      } else {
+        return this.$store.getters.mergedConfig.unsavedPostAction
+      }
     },
     shouldConfirm () {
       return this.action === 'confirm'
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index ca5e30e0..d533eb88 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -525,7 +525,7 @@
             {{ $t('settings.auto_save_draft') }}
           </BooleanSetting>
         </li>
-        <li>
+        <li v-if="!autoSaveDraft">
           <ChoiceSetting
             id="unsavedPostAction"
             path="unsavedPostAction"