diff --git a/src/layouts/partial-panel-resolver.html b/src/layouts/partial-panel-resolver.html
index fb381dca38..b7633ab301 100644
--- a/src/layouts/partial-panel-resolver.html
+++ b/src/layouts/partial-panel-resolver.html
@@ -43,7 +43,7 @@ Polymer({
         hass: this.hass,
         narrow: this.narrow,
         showMenu: this.showMenu,
-        panel: panel,
+        panel: panel.toJS(),
       });
   },
 
diff --git a/src/more-infos/more-info-media_player.html b/src/more-infos/more-info-media_player.html
index 1ba5537f60..df75c6f99b 100644
--- a/src/more-infos/more-info-media_player.html
+++ b/src/more-infos/more-info-media_player.html
@@ -38,6 +38,10 @@
       paper-dropdown-menu.source-input {
         margin-left: 10px;
       }
+
+      [hidden] {
+        display: none !important;
+      }
     </style>
 
     <div class$='[[computeClassNames(stateObj)]]'>