diff --git a/src/dialogs/more-info-dialog.js b/src/dialogs/more-info-dialog.js
index 574c6e7ce1..1e00281754 100644
--- a/src/dialogs/more-info-dialog.js
+++ b/src/dialogs/more-info-dialog.js
@@ -106,8 +106,8 @@ export default new Polymer({
     }
 
     this.showHistoryComponent = (
-      DOMAINS_WITH_NO_HISTORY.indexOf(this.stateObj.domain) === -1 &&
-      this.hasHistoryComponent
+      this.hasHistoryComponent &&
+      DOMAINS_WITH_NO_HISTORY.indexOf(this.stateObj.domain) === -1
     );
 
     this.async(() => {
diff --git a/src/state-summary/state-card-toggle.html b/src/state-summary/state-card-toggle.html
index c9926916da..8721ab2401 100755
--- a/src/state-summary/state-card-toggle.html
+++ b/src/state-summary/state-card-toggle.html
@@ -15,9 +15,7 @@
 
       <paper-toggle-button class='self-center'
         checked="[[toggleChecked]]"
-        on-change="toggleChanged"
-        on-click="toggleTapped">
-      </paper-toggle-button>
+        on-change="toggleChanged"></paper-toggle-button>
     </div>
 
   </template>
diff --git a/src/state-summary/state-card-toggle.js b/src/state-summary/state-card-toggle.js
index e465394ba5..28c76b96a0 100644
--- a/src/state-summary/state-card-toggle.js
+++ b/src/state-summary/state-card-toggle.js
@@ -23,10 +23,6 @@ export default new Polymer({
     this.forceStateChange();
   },
 
-  toggleTapped(ev) {
-    ev.stopPropagation();
-  },
-
   toggleChanged(ev) {
     const newVal = ev.target.checked;