diff --git a/src/components/ha-clickable-list-item.ts b/src/components/ha-clickable-list-item.ts
index 5e02d4efb5..11a18caca4 100644
--- a/src/components/ha-clickable-list-item.ts
+++ b/src/components/ha-clickable-list-item.ts
@@ -6,6 +6,8 @@ import { html } from "lit-html";
 export class HaClickableListItem extends ListItem {
   public href?: string;
 
+  public disableHref = false;
+
   // property used only in css
   @property({ type: Boolean, reflect: true }) public rtl = false;
 
@@ -14,9 +16,9 @@ export class HaClickableListItem extends ListItem {
     const href = this.href ? `/${this.href}` : "";
 
     return html` ${this.renderRipple()}
-      <a aria-role="option" href=${href}>
-        ${r}
-      </a>`;
+    ${this.disableHref
+      ? html`<a aria-role="option">${r}</a>`
+      : html`<a aria-role="option" href=${href}>${r}</a>`}`;
   }
 
   static get styles(): CSSResult[] {
diff --git a/src/components/ha-sidebar.ts b/src/components/ha-sidebar.ts
index 177a949769..dd99ea7935 100644
--- a/src/components/ha-sidebar.ts
+++ b/src/components/ha-sidebar.ts
@@ -47,6 +47,7 @@ import { actionHandler } from "../panels/lovelace/common/directives/action-handl
 import { haStyleScrollbar } from "../resources/styles";
 import type { HomeAssistant, PanelInfo } from "../types";
 import { ListItem } from "@material/mwc-list/mwc-list-item";
+import { navigate } from "../common/navigate";
 
 const SHOW_AFTER_SPACER = ["config", "developer-tools", "hassio"];
 
@@ -603,7 +604,6 @@ class HaSidebar extends LitElement {
       animation: 150,
       fallbackClass: "sortable-fallback",
       dataIdAttr: "data-panel",
-      handle: "ha-clickable-list-item",
       onSort: async () => {
         this._panelOrder = this._sortable.toArray();
       },
@@ -849,18 +849,19 @@ class HaSidebar extends LitElement {
       <ha-clickable-list-item
         .activated=${urlPath === this.hass.panelUrl}
         .href=${urlPath}
+        .disableHref=${this.editMode}
         data-panel=${urlPath}
         tabindex="-1"
         @mouseenter=${this._itemMouseEnter}
         @mouseleave=${this._itemMouseLeave}
+        @click=${() => navigate(this, `/${urlPath}`)}
         graphic="icon"
         .rtl=${this.rtl}
       >
         ${iconPath
           ? html`<ha-svg-icon slot="graphic" .path=${iconPath}></ha-svg-icon>`
           : html`<ha-icon slot="graphic" .icon=${icon}></ha-icon>`}
-
-        <span class="item-text">${title}</span>
+        ${title}
         ${this.editMode
           ? html`<mwc-icon-button
               class="hide-panel"
diff --git a/src/resources/ha-sortable-style-ha-clickable.ts b/src/resources/ha-sortable-style-ha-clickable.ts
index f042f71e58..427b4f9f3e 100644
--- a/src/resources/ha-sortable-style-ha-clickable.ts
+++ b/src/resources/ha-sortable-style-ha-clickable.ts
@@ -34,16 +34,13 @@ export const sortableStyles = css`
 
   .sortable-fallback {
     display: none;
+    opacity: 0;
   }
 
   .sortable-ghost {
     opacity: 0.4;
   }
 
-  .sortable-fallback {
-    opacity: 0;
-  }
-
   @keyframes keyframes1 {
     0% {
       transform: rotate(-1deg);