diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index 6f3152901..dcf217abd 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -164,6 +164,7 @@
     }
 
     textarea {
+      padding-bottom: 0;
       margin-bottom: 2.5em;
     }
   }
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 2477c48b7..3a319e85a 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -123,6 +123,7 @@
               role="radio"
               :radio="true"
               :model-value="!quoteThreadToggled"
+              :disabled="quoteFormVisible"
               @update:model-value="e => quoteThreadToggled = !e"
             >
               {{ $t('post_status.reply_option') }}