diff --git a/fold-entity-row.js b/fold-entity-row.js
index 2b01771..b521353 100644
--- a/fold-entity-row.js
+++ b/fold-entity-row.js
@@ -5,7 +5,7 @@
       </div>
       <div id="toggle">
         <ha-icon
-        @click="${()=>this.open=!this.open}"
+        @click="${e=>{e.stopPropagation(),this.open=!this.open}}"
         icon=${this.open?"mdi:chevron-up":"mdi:chevron-down"}
         ></ha-icon>
       </div>
diff --git a/src/main.js b/src/main.js
index 8252998..d08e616 100644
--- a/src/main.js
+++ b/src/main.js
@@ -78,7 +78,11 @@ class FoldEntityRow extends LitElement {
       </div>
       <div id="toggle">
         <ha-icon
-        @click="${() => this.open = !this.open}"
+        @click="${(ev) => {
+          ev.stopPropagation();
+          this.open = !this.open;
+          }
+        }"
         icon=${this.open ? "mdi:chevron-up" : "mdi:chevron-down"}
         ></ha-icon>
       </div>