diff --git a/src/components/nowPlayingBar/nowPlayingBar.css b/src/components/nowPlayingBar/nowPlayingBar.css
index 6c6aeb0011..e545d82d1e 100644
--- a/src/components/nowPlayingBar/nowPlayingBar.css
+++ b/src/components/nowPlayingBar/nowPlayingBar.css
@@ -154,7 +154,8 @@
     display: none;
 }
 
-.layout-desktop .nowPlayingBarRight .playPauseButton {
+.layout-desktop .nowPlayingBarRight .playPauseButton,
+.layout-tv .nowPlayingBarRight .playPauseButton {
     display: none;
 }
 
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index 3a69353b43..a83009ad90 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -518,8 +518,8 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                     case 'Shuffle':
                         shuffleButton.classList.toggle(cssClass, true);
                         break;
-                    default:
                     case 'Sorted':
+                    default:
                         shuffleButton.classList.toggle(cssClass, false);
                         break;
                 }