diff --git a/src/cards/ha-entities-card.html b/src/cards/ha-entities-card.html
index f2ee5b7c69..f8aa3c9039 100644
--- a/src/cards/ha-entities-card.html
+++ b/src/cards/ha-entities-card.html
@@ -110,7 +110,7 @@ Polymer({
   showGroupToggle: function (groupEntity, states) {
     var canToggleCount;
 
-    if (!groupEntity || !states ||
+    if (!groupEntity || !states || groupEntity.attributes.control === 'hidden' ||
         (groupEntity.state !== 'on' && groupEntity.state !== 'off')) {
       return false;
     }
diff --git a/src/util/hass-util.html b/src/util/hass-util.html
index df5788d2b0..f84e78d29b 100644
--- a/src/util/hass-util.html
+++ b/src/util/hass-util.html
@@ -163,13 +163,12 @@ window.hassUtil.relativeTime.tests = [
   7, 'day',
 ];
 
-
 window.hassUtil.stateCardType = function (hass, state) {
   if (state.state === 'unavailable') {
     return 'display';
   } else if (window.hassUtil.DOMAINS_WITH_CARD.indexOf(state.domain) !== -1) {
     return state.domain;
-  } else if (window.hassUtil.canToggle(hass, state.entityId)) {
+  } else if (window.hassUtil.canToggle(hass, state.entityId) && state.attributes.control !== 'hidden') {
     return 'toggle';
   }
   return 'display';