diff --git a/src/components/remotecontrol/remotecontrol.css b/src/components/remotecontrol/remotecontrol.css
index c260799585..1c31b4382b 100644
--- a/src/components/remotecontrol/remotecontrol.css
+++ b/src/components/remotecontrol/remotecontrol.css
@@ -222,18 +222,10 @@
     margin: 0;
 }
 
-.layout-mobile .nowPlayingSecondaryButtons .btnShuffleQueue {
-    display: none;
-}
-
 .layout-mobile .nowPlayingSecondaryButtons .volumecontrol {
     display: none;
 }
 
-.layout-mobile .nowPlayingSecondaryButtons .btnRepeat {
-    display: none;
-}
-
 .layout-desktop .nowPlayingInfoButtons .btnRepeat,
 .layout-tv .nowPlayingInfoButtons .btnRepeat {
     display: none;
@@ -362,7 +354,8 @@
         border-radius: 0;
     }
 
-    .nowPlayingInfoButtons .btnRepeat {
+    .nowPlayingInfoButtons .btnRepeat,
+    .nowPlayingInfoButtons .btnRewind {
         position: absolute;
         left: 0;
         margin-left: 0;
@@ -370,7 +363,8 @@
         font-size: smaller;
     }
 
-    .nowPlayingInfoButtons .btnShuffleQueue {
+    .nowPlayingInfoButtons .btnShuffleQueue,
+    .nowPlayingInfoButtons .btnFastForward {
         position: absolute;
         right: 0;
         margin-right: 0;
@@ -468,7 +462,6 @@
 }
 
 @media all and (max-width: 63em) {
-    .nowPlayingSecondaryButtons .repeatToggleButton,
     .nowPlayingInfoButtons .playlist .listItemMediaInfo,
     .nowPlayingInfoButtons .btnStop {
         display: none !important;
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index 6048c918c7..6a1355047c 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -332,8 +332,14 @@ export default function () {
         buttonVisible(context.querySelector('.btnNextTrack'), item != null);
         buttonVisible(context.querySelector('.btnPreviousTrack'), item != null);
         if (layoutManager.mobile) {
-            buttonVisible(context.querySelector('.btnRewind'), false);
-            buttonVisible(context.querySelector('.btnFastForward'), false);
+            const playingVideo = playbackManager.isPlayingVideo() && item != null;
+            const playingAudio = !playbackManager.isPlayingVideo() && item != null;
+            buttonVisible(context.querySelector('.btnRepeat'), playingAudio);
+            buttonVisible(context.querySelector('.btnShuffleQueue'), playingAudio);
+            buttonVisible(context.querySelector('.btnRewind'), playingVideo);
+            buttonVisible(context.querySelector('.btnFastForward'), playingVideo);
+            buttonVisible(context.querySelector('.nowPlayingSecondaryButtons .btnShuffleQueue'), playingVideo);
+            buttonVisible(context.querySelector('.nowPlayingSecondaryButtons .btnRepeat'), playingVideo);
         } else {
             buttonVisible(context.querySelector('.btnRewind'), item != null);
             buttonVisible(context.querySelector('.btnFastForward'), item != null);