diff --git a/src/components/player/Player.tsx b/src/components/player/Player.tsx
index 89ec5cde..3df4d517 100644
--- a/src/components/player/Player.tsx
+++ b/src/components/player/Player.tsx
@@ -12,3 +12,4 @@ export * from "./internals/BookmarkButton";
 export * from "./internals/InfoButton";
 export * from "./internals/SkipEpisodeButton";
 export * from "./atoms/Chromecast";
+export * from "./atoms/Widescreen";
diff --git a/src/pages/parts/player/PlayerPart.tsx b/src/pages/parts/player/PlayerPart.tsx
index df502218..72a348d0 100644
--- a/src/pages/parts/player/PlayerPart.tsx
+++ b/src/pages/parts/player/PlayerPart.tsx
@@ -5,7 +5,6 @@ import { Player } from "@/components/player";
 import { SkipIntroButton } from "@/components/player/atoms/SkipIntroButton";
 import { UnreleasedEpisodeOverlay } from "@/components/player/atoms/UnreleasedEpisodeOverlay";
 import { WatchPartyStatus } from "@/components/player/atoms/WatchPartyStatus";
-import { Widescreen } from "@/components/player/atoms/Widescreen";
 import { useShouldShowControls } from "@/components/player/hooks/useShouldShowControls";
 import { useSkipTime } from "@/components/player/hooks/useSkipTime";
 import { useIsMobile } from "@/hooks/useIsMobile";
@@ -185,14 +184,10 @@ export function PlayerPart(props: PlayerPartProps) {
                 <Player.Settings />
               </>
             ) : null}
-            {/* Fullscreen on when not shifting */}
-            {!isShifting && <Player.Fullscreen />}
-
-            {/* Expand button visible when shifting */}
-            {isShifting && (
-              <div>
-                <Widescreen />
-              </div>
+            {isShifting || isHoldingFullscreen ? (
+              <Player.Widescreen />
+            ) : (
+              <Player.Fullscreen />
             )}
           </div>
         </div>
@@ -221,7 +216,11 @@ export function PlayerPart(props: PlayerPartProps) {
                 className="select-none touch-none"
                 style={{ WebkitTapHighlightColor: "transparent" }}
               >
-                {isHoldingFullscreen ? <Widescreen /> : <Player.Fullscreen />}
+                {isHoldingFullscreen ? (
+                  <Player.Widescreen />
+                ) : (
+                  <Player.Fullscreen />
+                )}
               </div>
             )}
           </div>