diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a9a9046a273e42c920183a5d7ea1998285e9bf1..5dfe741c1de463114084879c4a9b74c9ec9fd5a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,7 +30,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Newlines in the muted words settings work again
 - Clicking on non-latin hashtags won't open a new window
 - Uploading and drag-dropping multiple files works correctly now.
-- Fix status ellipsis menu being cut off in notifications column.
+- Subject field now appears disabled when posting
+- Fix status ellipsis menu being cut off in notifications column
 
 ## [2.0.3] - 2020-05-02
 ### Fixed
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index c4d7f7e27fe1985690c8614c4bd25a8477314b8a..e3d8d087f358f7e793a5b192055ed8018a453b2a 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -81,6 +81,7 @@
             v-model="newStatus.spoilerText"
             type="text"
             :placeholder="$t('post_status.content_warning')"
+            :disabled="posting"
             class="form-post-subject"
           >
         </EmojiInput>