diff --git a/src/layouts/home-assistant-main.ts b/src/layouts/home-assistant-main.ts
index 1b65f33de3..5024927d77 100644
--- a/src/layouts/home-assistant-main.ts
+++ b/src/layouts/home-assistant-main.ts
@@ -87,6 +87,7 @@ export class HomeAssistantMain extends LitElement {
           .swipeOpen=${!disableSwipe}
           .persistent=${!this.narrow &&
           this.hass.dockedSidebar !== "always_hidden"}
+          @app-drawer-transitioned=${this._drawerTransitioned}
         >
           <ha-sidebar
             .hass=${hass}
@@ -188,6 +189,13 @@ export class HomeAssistantMain extends LitElement {
     }
   }
 
+  private _drawerTransitioned(ev: CustomEvent) {
+    const drawer = ev.currentTarget as AppDrawerElement;
+    if (!drawer.opened) {
+      this._sidebarEditMode = false;
+    }
+  }
+
   private get _sidebarNarrow() {
     return this.narrow || this.hass.dockedSidebar === "always_hidden";
   }