diff --git a/src/components/nowPlayingBar/nowPlayingBar.js b/src/components/nowPlayingBar/nowPlayingBar.js
index 4158ae6f9..dfb73a860 100644
--- a/src/components/nowPlayingBar/nowPlayingBar.js
+++ b/src/components/nowPlayingBar/nowPlayingBar.js
@@ -195,7 +195,6 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
                 case 'RepeatOne':
                     playbackManager.setRepeatMode('RepeatNone');
                     break;
-                default:
                 case 'RepeatNone':
                     playbackManager.setRepeatMode('RepeatAll');
             }
@@ -203,11 +202,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
 
         toggleRepeatButtonIcon = toggleRepeatButton.querySelector('.material-icons');
 
-        if (appHost.supports('physicalvolumecontrol')) {
-            volumeSliderContainer.classList.add('hide');
-        } else {
-            volumeSliderContainer.classList.remove('hide');
-        }
+        volumeSliderContainer.classList.toggle('hide', appHost.supports('physicalvolumecontrol'));
 
         function setVolume() {
             if (currentPlayer) {
@@ -371,8 +366,8 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
                 toggleRepeatButtonIcon.classList.add('repeat_one');
                 toggleRepeatButton.classList.add(cssClass);
                 break;
-            default:
             case 'RepeatNone':
+            default:
                 toggleRepeatButtonIcon.classList.add('repeat');
                 toggleRepeatButton.classList.remove(cssClass);
                 break;
@@ -445,11 +440,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
         // See bindEvents for why this is necessary
         if (volumeSlider) {
 
-            if (showVolumeSlider) {
-                volumeSliderContainer.classList.remove('hide');
-            } else {
-                volumeSliderContainer.classList.add('hide');
-            }
+            volumeSliderContainer.classList.toggle('hide', showVolumeSlider);
 
             if (!volumeSlider.dragging) {
                 volumeSlider.value = volumeLevel || 0;
@@ -630,6 +621,10 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
     }
 
     function onQueueShuffleModeChange() {
+        if (!isEnabled) {
+            return;
+        }
+
         let shuffleMode = playbackManager.getQueueShuffleMode();
         let context = nowPlayingBarElement;
         const cssClass = 'shuffleQueue-active';
@@ -637,11 +632,11 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
 
         switch (shuffleMode) {
             case 'Shuffle':
-                toggleShuffleButton.classList.toggle(cssClass, true);
+                toggleShuffleButton.classList.add(cssClass);
                 break;
-            default:
             case 'Sorted':
-                toggleShuffleButton.classList.toggle(cssClass, false);
+            default:
+                toggleShuffleButton.classList.remove(cssClass);
                 break;
         }
     }
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index 81ea967ec..3a69353b4 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -258,10 +258,8 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 case 'RepeatOne':
                     playbackManager.setRepeatMode('RepeatNone');
                     break;
-                default:
                 case 'RepeatNone':
                     playbackManager.setRepeatMode('RepeatAll');
-                    break;
             }
         }
 
@@ -362,8 +360,8 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 case 'RepeatOne':
                     innHtml = '<span class="material-icons repeat_one"></span>';
                     break;
-                default:
                 case 'RepeatNone':
+                default:
                     repeatOn = false;
                     break;
             }
@@ -407,21 +405,14 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
             if (!showMuteButton && !showVolumeSlider) {
                 context.querySelector('.volumecontrol').classList.add('hide');
             } else {
-                if (showMuteButton) {
-                    buttonMute.classList.remove('hide');
-                } else {
-                    buttonMute.classList.add('hide');
-                }
+                buttonMute.classList.toggle('hide', showMuteButton);
 
                 var nowPlayingVolumeSlider = context.querySelector('.nowPlayingVolumeSlider');
                 var nowPlayingVolumeSliderContainer = context.querySelector('.nowPlayingVolumeSliderContainer');
 
                 if (nowPlayingVolumeSlider) {
-                    if (showVolumeSlider) {
-                        nowPlayingVolumeSliderContainer.classList.remove('hide');
-                    } else {
-                        nowPlayingVolumeSliderContainer.classList.add('hide');
-                    }
+
+                    nowPlayingVolumeSliderContainer.classList.toggle('hide', !showVolumeSlider);
 
                     if (!nowPlayingVolumeSlider.dragging) {
                         nowPlayingVolumeSlider.value = volumeLevel || 0;