diff --git a/src/components/ha-sidebar.ts b/src/components/ha-sidebar.ts
index d02c7bbd60..41d460fc9f 100644
--- a/src/components/ha-sidebar.ts
+++ b/src/components/ha-sidebar.ts
@@ -526,7 +526,7 @@ class HaSidebar extends LitElement {
 
   private async _hidePanel(ev: Event) {
     ev.preventDefault();
-    const panel = (ev.target as any).panel;
+    const panel = (ev.currentTarget as any).panel;
     if (this._hiddenPanels.includes(panel)) {
       return;
     }
@@ -692,12 +692,13 @@ class HaSidebar extends LitElement {
             : html`<ha-icon slot="item-icon" .icon=${icon}></ha-icon>`}
           <span class="item-text">${title}</span>
           ${this._editMode
-            ? html`<ha-svg-icon
+            ? html`<mwc-icon-button
                 class="hide-panel"
                 .panel=${urlPath}
                 @click=${this._hidePanel}
-                .path=${mdiClose}
-              ></ha-svg-icon>`
+              >
+                <ha-svg-icon .path=${mdiClose}></ha-svg-icon>
+              </mwc-icon-button>`
             : ""}
         </paper-icon-item>
       </a>
diff --git a/src/resources/ha-sortable-style.ts b/src/resources/ha-sortable-style.ts
index 5751f54819..b6e3d377c5 100644
--- a/src/resources/ha-sortable-style.ts
+++ b/src/resources/ha-sortable-style.ts
@@ -57,7 +57,7 @@ export const sortableStyles = css`
   .hide-panel {
     display: none;
     position: absolute;
-    right: 8px;
+    right: 0;
   }
 
   :host([expanded]) .hide-panel {