diff --git a/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-media_player.html b/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-media_player.html index 2008fddf41e..2f10a0897a4 100644 --- a/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-media_player.html +++ b/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-media_player.html @@ -167,7 +167,7 @@ }, computeHidePowerButton: function(isOff, supportsTurnOn, supportsTurnOff) { - return isOff && !supportsTurnOn || !isOff && supportsTurnOff; + return isOff ? !supportsTurnOn : !supportsTurnOff; }, handleTogglePower: function() { diff --git a/homeassistant/components/media_player/__init__.py b/homeassistant/components/media_player/__init__.py index 0071760967f..0cb4608ba1b 100644 --- a/homeassistant/components/media_player/__init__.py +++ b/homeassistant/components/media_player/__init__.py @@ -487,7 +487,9 @@ class MediaPlayerDevice(Entity): def state_attributes(self): """ Return the state attributes. """ if self.state == STATE_OFF: - state_attr = {} + state_attr = { + ATTR_SUPPORTED_MEDIA_COMMANDS: self.supported_media_commands, + } else: state_attr = { attr: getattr(self, attr) for attr