diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index 2a88445bb..759c817d5 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -3752,9 +3752,12 @@ public final class Player implements
             default:
                 break;
             case KeyEvent.KEYCODE_SPACE:
-                playPause();
-                if (isPlaying()) {
-                    hideControls(0, 0);
+                if (isFullscreen) {
+                    playPause();
+                    if (isPlaying()) {
+                        hideControls(0, 0);
+                    }
+                    return true;
                 }
                 break;
             case KeyEvent.KEYCODE_BACK:
diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java b/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java
index fbe12efb1..ee0a6f118 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java
@@ -88,6 +88,7 @@ public class PlayerMediaSession implements MediaSessionCallback {
     @Override
     public void play() {
         player.play();
+        // hide the player controls even if the play command came from the media session
         player.hideControls(0, 0);
     }