diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 944c43153..f9eb1bdcd 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -363,6 +363,12 @@ const PostStatusForm = {
       }
     },
     safeToSaveDraft () {
+      console.log('safe', (
+        this.newStatus.status ||
+        this.newStatus.spoilerText ||
+        this.newStatus.files?.length ||
+        this.newStatus.hasPoll
+      ) && this.saveable)
       return (
         this.newStatus.status ||
         this.newStatus.spoilerText ||
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index e5eaa3af8..260a89cb7 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -334,22 +334,26 @@
                 class="dropdown-menu"
                 role="menu"
               >
-                <button
-                  v-if="!hideDraft || !disableDraft"
+                <div
                   class="menu-item dropdown-item"
-                  role="menu"
-                  :disabled="!safeToSaveDraft && saveable"
                   :class="{ disabled: !safeToSaveDraft }"
-                  @click.prevent="saveDraft"
-                  @click="close"
                 >
-                  <template v-if="closeable">
-                    {{ $t('post_status.save_to_drafts_and_close_button') }}
-                  </template>
-                  <template v-else>
-                    {{ $t('post_status.save_to_drafts_button') }}
-                  </template>
-                </button>
+                  <button
+                    v-if="!hideDraft || !disableDraft"
+                    class="main-button"
+                    role="menu"
+                    :disabled="!safeToSaveDraft"
+                    @click.prevent="saveDraft"
+                    @click="close"
+                  >
+                    <template v-if="closeable">
+                      {{ $t('post_status.save_to_drafts_and_close_button') }}
+                    </template>
+                    <template v-else>
+                      {{ $t('post_status.save_to_drafts_button') }}
+                    </template>
+                  </button>
+                </div>
               </div>
             </template>
           </Popover>