diff --git a/README.md b/README.md
index 0685d9ab..0b02e0cb 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,8 @@
 - add option to prevent page from getting pushed when making a new post with streaming api enabled (similar to 3rd "for unreads" option)
 - add link on user card to open profiles in iceshrimp-fe
 - add option to open conversation view by clicking empty space in posts
+- add ability to close the reply box under posts that were deleted
+  - also an option to close it automatically
 - add a script to download ruffle for flash support (requires python3 and requests library)
   - download by entering `tools/` and running `python3 download_ruffle.py`
 
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 25eac1d6..0617facc 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -243,7 +243,8 @@ const PostStatusForm = {
       activeEmojiInput: undefined,
       activeTextInput: undefined,
       subjectVisible: showSubject,
-      showingPostConfirmDialog: false
+      showingPostConfirmDialog: false,
+      notClosed: true
     }
   },
   computed: {
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index ebab96ab..f6d38119 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -295,6 +295,16 @@
             <FAIcon icon="eye-slash" />
           </button>
         </div>
+        <div>
+          <button
+            v-if="replyTo !== undefined && $parent.deleted"
+            class="poll-icon button-unstyled"
+            :title="$t('nav.close')"
+            @click="$parent.toggleReplying()"
+          >
+            <FAIcon icon="xmark" />
+          </button>
+        </div>
         <button
           v-if="posting"
           disabled
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index e7fea7fb..dc64d348 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -240,6 +240,14 @@
             </li>
           </ul>
         </li>
+        <li>
+          <BooleanSetting
+            path="autoCloseReplyUIWhenPostDeleted"
+            expert="1"
+          >
+            {{ $t('settings.auto_close_reply_ui_when_post_deleted') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting
             path="virtualScrolling"
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 0f9ab825..bd7dfdeb 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -187,6 +187,8 @@ const Status = {
       return highlightClass(user)
     },
     deleted () {
+      if (this.$store.getters.mergedConfig.autoCloseReplyUIWhenPostDeleted && this.statusoid.deleted && this.replying)
+        this.toggleReplying()
       return this.statusoid.deleted
     },
     getDeletedWSSOption () {
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 8560cab6..ef882204 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -306,6 +306,7 @@
         "bubble_timeline": "Bubble timeline",
         "bubble_timeline_description": "Posts from instances close to yours, as recommended by the admins",
         "chats": "Chats",
+        "close": "Close",
         "dms": "Direct messages",
         "friend_requests": "Follow requests",
         "home_timeline": "Home timeline",
@@ -482,6 +483,7 @@
         "app_name": "App name",
         "attachmentRadius": "Attachments",
         "attachments": "Attachments",
+        "auto_close_reply_ui_when_post_deleted": "Automatically close the reply box when the post you're replying to is deleted",
         "auto_refresh_on_required": "Automatically refresh when one of the below options are changed",
         "autohide_floating_post_button": "Automatically hide New Post button (mobile)",
         "avatar": "Avatar",