diff --git a/guacamole/src/main/frontend/src/app/player/templates/player.html b/guacamole/src/main/frontend/src/app/player/templates/player.html
index 91594b40e..8806775ea 100644
--- a/guacamole/src/main/frontend/src/app/player/templates/player.html
+++ b/guacamole/src/main/frontend/src/app/player/templates/player.html
@@ -3,7 +3,11 @@
                      ng-click="togglePlayback()"></guac-player-display>
 
 <!-- Player controls -->
-<div class="guac-player-controls" ng-show="recording">
+<div class="guac-player-controls" ng-show="recording"
+        ng-class="{
+            'paused' : !recording.isPlaying(),
+            'playing' : recording.isPlaying()
+        }">
 
     <!-- Playback position slider -->
     <input class="guac-player-seek" type="range" min="0" step="1"
diff --git a/guacamole/src/main/frontend/src/app/settings/styles/history-player.css b/guacamole/src/main/frontend/src/app/settings/styles/history-player.css
index 03d562a53..7503cc8c3 100644
--- a/guacamole/src/main/frontend/src/app/settings/styles/history-player.css
+++ b/guacamole/src/main/frontend/src/app/settings/styles/history-player.css
@@ -96,7 +96,7 @@
     background: rgba(0, 0, 0, 0.5);
 }
 
-.settings.connectionHistoryPlayer.playing .guac-player-controls {
+.settings.connectionHistoryPlayer .guac-player-controls.playing {
     opacity: 0;
     -webkit-transition: opacity 0.25s linear 0.25s;
     -moz-transition: opacity 0.25s linear 0.25s;
@@ -104,8 +104,8 @@
     transition: opacity 0.25s linear 0.25s;
 }
 
-.settings.connectionHistoryPlayer.paused .guac-player-controls,
-.settings.connectionHistoryPlayer.playing:hover .guac-player-controls {
+.settings.connectionHistoryPlayer .guac-player-controls.paused,
+.settings.connectionHistoryPlayer .guac-player-controls.playing:hover {
     opacity: 1;
     -webkit-transition-delay: 0s;
     -moz-transition-delay: 0s;
diff --git a/guacamole/src/main/frontend/src/app/settings/templates/settingsConnectionHistoryPlayer.html b/guacamole/src/main/frontend/src/app/settings/templates/settingsConnectionHistoryPlayer.html
index 41d6aa873..d986864d1 100644
--- a/guacamole/src/main/frontend/src/app/settings/templates/settingsConnectionHistoryPlayer.html
+++ b/guacamole/src/main/frontend/src/app/settings/templates/settingsConnectionHistoryPlayer.html
@@ -1,11 +1,6 @@
-<guac-viewport class="settings view connectionHistoryPlayer"
-     ng-class="{
-         'no-recording' : !selectedRecording,
-         'paused' : !playing,
-         'playing' : playing
-     }">
+<guac-viewport class="settings view connectionHistoryPlayer">
 
     <!-- Player for selected recording -->
     <guac-player src="tunnel"></guac-player>
 
-</guac-viewport>
\ No newline at end of file
+</guac-viewport>