diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js
index ab85bc434c..c82ee4fb15 100644
--- a/src/controllers/playback/video/index.js
+++ b/src/controllers/playback/video/index.js
@@ -403,11 +403,12 @@ import { appRouter } from '../../../components/appRouter';
         }
 
         function onFullscreenChanged() {
-            if (!layoutManager.tv) {
-                updateFullscreenIcon();
-            } else if (!playbackManager.isFullscreen(currentPlayer)) {
+            if (!playbackManager.isFullscreen(currentPlayer)) {
                 appRouter.back();
+                return;
             }
+
+            updateFullscreenIcon();
         }
 
         function updateFullscreenIcon() {