diff --git a/ts/components/LeftPane.tsx b/ts/components/LeftPane.tsx
index d8cd8fac80..e5480875d3 100644
--- a/ts/components/LeftPane.tsx
+++ b/ts/components/LeftPane.tsx
@@ -244,6 +244,20 @@ export const LeftPane: React.FC<PropsType> = ({
       const { ctrlKey, shiftKey, altKey, metaKey, key } = event;
       const commandOrCtrl = OS.isMacOS() ? metaKey : ctrlKey;
 
+      if (event.key === 'Escape') {
+        const backAction = helper.getBackAction({
+          showInbox,
+          startComposing,
+          showChooseGroupMembers,
+        });
+        if (backAction) {
+          event.preventDefault();
+          event.stopPropagation();
+          backAction();
+          return;
+        }
+      }
+
       if (
         commandOrCtrl &&
         !shiftKey &&
@@ -314,6 +328,8 @@ export const LeftPane: React.FC<PropsType> = ({
     openConversationInternal,
     selectedConversationId,
     selectedMessageId,
+    showChooseGroupMembers,
+    showInbox,
     startComposing,
   ]);
 
@@ -371,23 +387,7 @@ export const LeftPane: React.FC<PropsType> = ({
   // [0]: https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/645900a0e296ca7053dbf6cd9e12cc85849de2d5/docs/rules/no-static-element-interactions.md#case-the-event-handler-is-only-being-used-to-capture-bubbled-events
   /* eslint-disable jsx-a11y/no-static-element-interactions */
   return (
-    <div
-      className="module-left-pane"
-      onKeyDown={event => {
-        if (event.key === 'Escape') {
-          const backAction = helper.getBackAction({
-            showInbox,
-            startComposing,
-            showChooseGroupMembers,
-          });
-          if (backAction) {
-            event.preventDefault();
-            event.stopPropagation();
-            backAction();
-          }
-        }
-      }}
-    >
+    <div className="module-left-pane">
       {/* eslint-enable jsx-a11y/no-static-element-interactions */}
       <div className="module-left-pane__header">
         {helper.getHeaderContents({
@@ -399,12 +399,8 @@ export const LeftPane: React.FC<PropsType> = ({
       </div>
       {renderExpiredBuildDialog()}
       {renderRelinkDialog()}
-      {helper.shouldRenderNetworkStatusAndUpdateDialog() && (
-        <>
-          {renderNetworkStatus()}
-          {renderUpdateDialog()}
-        </>
-      )}
+      {renderNetworkStatus()}
+      {renderUpdateDialog()}
       {preRowsNode && <React.Fragment key={0}>{preRowsNode}</React.Fragment>}
       <Measure bounds>
         {({ contentRect, measureRef }: MeasuredComponentProps) => (
diff --git a/ts/components/leftPane/LeftPaneHelper.tsx b/ts/components/leftPane/LeftPaneHelper.tsx
index e92f5adc22..d4887e7f52 100644
--- a/ts/components/leftPane/LeftPaneHelper.tsx
+++ b/ts/components/leftPane/LeftPaneHelper.tsx
@@ -40,10 +40,6 @@ export abstract class LeftPaneHelper<T> {
     return undefined;
   }
 
-  shouldRenderNetworkStatusAndUpdateDialog(): boolean {
-    return false;
-  }
-
   getPreRowsNode(
     _: Readonly<{
       clearGroupCreationError: () => void;
diff --git a/ts/components/leftPane/LeftPaneInboxHelper.tsx b/ts/components/leftPane/LeftPaneInboxHelper.tsx
index 9548256333..88fedfd894 100644
--- a/ts/components/leftPane/LeftPaneInboxHelper.tsx
+++ b/ts/components/leftPane/LeftPaneInboxHelper.tsx
@@ -38,10 +38,6 @@ export class LeftPaneInboxHelper extends LeftPaneHelper<LeftPaneInboxPropsType>
     this.pinnedConversations = pinnedConversations;
   }
 
-  shouldRenderNetworkStatusAndUpdateDialog(): boolean {
-    return true;
-  }
-
   getRowCount(): number {
     const headerCount = this.hasPinnedAndNonpinned() ? 2 : 0;
     const buttonCount = this.archivedConversations.length ? 1 : 0;