diff --git a/dist/index.js b/dist/index.js
index ab4bcd43..7d7661da 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -5150,6 +5150,8 @@
       this.registerKeyStroke("backspace" /* CloseOrCancel */, () => {
         if (this.isFilterModalOpen.value == true) {
           this.hideFilterModal();
+        } else if (this.replyViewSelectedMessage.value != void 0) {
+          this.resetReplyView();
         } else {
           this.replyingMessage.value = void 0;
         }
@@ -7289,7 +7291,8 @@
       {
         class: "ghost",
         "on:click": messagePageViewModel.resetReplyView,
-        "toggle:hidden": messagePageViewModel.isReplyViewInactive
+        "toggle:hidden": messagePageViewModel.isReplyViewInactive,
+        ctkeystroke: getKeySymbol("backspace" /* CloseOrCancel */)
       },
       /* @__PURE__ */ createElement("span", { class: "icon" }, "arrow_back")
     ), /* @__PURE__ */ createElement(
diff --git a/dist/sw.js b/dist/sw.js
index 426b4150..99e6d1e3 100644
--- a/dist/sw.js
+++ b/dist/sw.js
@@ -1,4 +1,4 @@
-const VERSION = "2610 Beta 26"
+const VERSION = "2610 Beta 27"
 
 function processUrl(event) {
     const url = event.request.url;
diff --git a/dist/version.txt b/dist/version.txt
index d8427eaf..cacb8df3 100644
--- a/dist/version.txt
+++ b/dist/version.txt
@@ -1 +1 @@
-2610 Beta 26
+2610 Beta 27
diff --git a/src/View/ChatPages/messagePage.tsx b/src/View/ChatPages/messagePage.tsx
index 8199b080..ca826429 100644
--- a/src/View/ChatPages/messagePage.tsx
+++ b/src/View/ChatPages/messagePage.tsx
@@ -111,83 +111,84 @@ export function MessagePage(
                             on:click={messagePageViewModel.resetReplyView}
                             toggle:hidden={
                                 messagePageViewModel.isReplyViewInactive
-                            }
-                        >
-                            <span class="icon">arrow_back</span>
-                        </button>
-                        <span
-                            class="title ellipsis width-100 flex"
-                            subscribe:innerText={title}
-                        ></span>
-                        <span>
-                            <button
-                                class="ghost inset-outline"
-                                on:click={messagePageViewModel.showFilterModal}
-                                aria-label={
-                                    coreViewModel.translations.chatPage.message
-                                        .filterMessagesButtonAudioLabel
-                                }
-                                toggle:selected={
-                                    messagePageViewModel.isFilterActive
-                                }
-                                ctkeystroke={getKeySymbol(CommonKeys.Filter)}
-                            >
-                                <span class="icon">filter_alt</span>
-                            </button>
-                        </span>
-                    </div>
-                    <div class="content">
-                        {messageContainer}
-                        <div id="composer">
-                            <div class="content-width-constraint">
-                                <div
-                                    class="reply-preview-wrapper"
-                                    children:set={replyPreview}
-                                ></div>
-                                <div class="input-width-constraint">
-                                    <input
-                                        id="focused"
-                                        class="blur"
-                                        bind:value={
-                                            messagePageViewModel.composingMessage
-                                        }
-                                        on:enter={
-                                            messagePageViewModel.sendMessage
-                                        }
-                                        placeholder={
-                                            coreViewModel.translations.chatPage
-                                                .message
-                                                .composerInputPlaceholder
-                                        }
-                                    ></input>
-                                    <button
-                                        class="primary blur"
-                                        aria-label={
-                                            coreViewModel.translations.chatPage
-                                                .message
-                                                .sendMessageButtonAudioLabel
-                                        }
-                                        on:click={
-                                            messagePageViewModel.sendMessage
-                                        }
-                                        toggle:disabled={
-                                            messagePageViewModel.cannotSendMessage
-                                        }
-                                    >
-                                        <span class="icon">send</span>
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
+			    }
+			    ctkeystroke={getKeySymbol(CommonKeys.CloseOrCancel)}
+			>
+			    <span class="icon">arrow_back</span>
+			</button>
+			<span
+			    class="title ellipsis width-100 flex"
+			    subscribe:innerText={title}
+			></span>
+			<span>
+			    <button
+				class="ghost inset-outline"
+				on:click={messagePageViewModel.showFilterModal}
+				aria-label={
+				    coreViewModel.translations.chatPage.message
+				    .filterMessagesButtonAudioLabel
+				}
+				toggle:selected={
+				    messagePageViewModel.isFilterActive
+				}
+				ctkeystroke={getKeySymbol(CommonKeys.Filter)}
+			    >
+				<span class="icon">filter_alt</span>
+			    </button>
+			</span>
+		    </div>
+		    <div class="content">
+			{messageContainer}
+			<div id="composer">
+			    <div class="content-width-constraint">
+				<div
+				    class="reply-preview-wrapper"
+				    children:set={replyPreview}
+				></div>
+				<div class="input-width-constraint">
+				    <input
+					id="focused"
+					class="blur"
+					bind:value={
+					    messagePageViewModel.composingMessage
+					}
+					on:enter={
+					    messagePageViewModel.sendMessage
+					}
+					placeholder={
+					    coreViewModel.translations.chatPage
+					    .message
+					    .composerInputPlaceholder
+					}
+				    ></input>
+				    <button
+					class="primary blur"
+					aria-label={
+					    coreViewModel.translations.chatPage
+					    .message
+					    .sendMessageButtonAudioLabel
+					}
+					on:click={
+					    messagePageViewModel.sendMessage
+					}
+					toggle:disabled={
+					    messagePageViewModel.cannotSendMessage
+					}
+				    >
+					<span class="icon">send</span>
+				    </button>
+				</div>
+			    </div>
+			</div>
+		    </div>
+		</div>
+	    </div>
 
-            {MessageFilterModal(
-                coreViewModel,
-                messagePageViewModel,
-                ChatMessageViewModelToView,
-            )}
-        </div>
+	    {MessageFilterModal(
+		coreViewModel,
+		messagePageViewModel,
+		ChatMessageViewModelToView,
+	    )}
+	</div>
     );
 }
diff --git a/src/ViewModel/Pages/messagePageViewModel.ts b/src/ViewModel/Pages/messagePageViewModel.ts
index 8dad5d22..7bc1c89a 100644
--- a/src/ViewModel/Pages/messagePageViewModel.ts
+++ b/src/ViewModel/Pages/messagePageViewModel.ts
@@ -245,7 +245,9 @@ export default class MessagePageViewModel extends Context {
         this.registerKeyStroke(CommonKeys.CloseOrCancel, () => {
             if (this.isFilterModalOpen.value == true) {
                 this.hideFilterModal();
-            } else {
+            } else if (this.replyViewSelectedMessage.value != undefined) {
+		this.resetReplyView();
+	    } else {
                 this.replyingMessage.value = undefined;
             }
         });