diff --git a/src/cards/ha-domain-card.js b/src/cards/ha-domain-card.js
index 84fc093a23..b0544632ae 100644
--- a/src/cards/ha-domain-card.js
+++ b/src/cards/ha-domain-card.js
@@ -21,6 +21,9 @@ export default new Polymer({
   },
 
   entityTapped(ev) {
+    if (ev.target.classList.contains('paper-toggle-button')) {
+      return;
+    }
     ev.stopPropagation();
     const entityId = ev.model.item.entityId;
     this.async(() => moreInfoActions.selectEntity(entityId), 1);
diff --git a/src/components/ha-sidebar.html b/src/components/ha-sidebar.html
index b9c7b6ef6c..7907441b1e 100644
--- a/src/components/ha-sidebar.html
+++ b/src/components/ha-sidebar.html
@@ -33,6 +33,7 @@
     }
 
     paper-icon-item {
+      padding-left: 24px;
       cursor: pointer;
       font-weight: 500;
     }