diff --git a/src/index.tsx b/src/index.tsx
index ec109383..080b9712 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -20,6 +20,7 @@ initializeChromecast();
 
 // TODO video todos:
 //  - mobile controls start showing when resizing
+//  - bug: popouts sometimes stop working when selecting different episode
 //  - captions
 //  - chrome cast support
 //  - safari fullscreen will make video overlap player controls
diff --git a/src/video/components/VideoPlayerBase.tsx b/src/video/components/VideoPlayerBase.tsx
index 71da6fd0..ec905e59 100644
--- a/src/video/components/VideoPlayerBase.tsx
+++ b/src/video/components/VideoPlayerBase.tsx
@@ -12,7 +12,6 @@ export function VideoPlayerBase(props: VideoPlayerBaseProps) {
   const ref = useRef<HTMLDivElement>(null);
   // TODO error boundary
   // TODO move error boundary to only decorated, <VideoPlayer /> shouldn't have styling
-  // TODO internal controls
 
   return (
     <VideoPlayerContextProvider>
diff --git a/src/video/components/actions/PauseAction.tsx b/src/video/components/actions/PauseAction.tsx
index 558ac914..d57e4f4d 100644
--- a/src/video/components/actions/PauseAction.tsx
+++ b/src/video/components/actions/PauseAction.tsx
@@ -20,8 +20,8 @@ export function PauseAction(props: Props) {
     else controls.play();
   }, [mediaPlaying, controls]);
 
-  // TODO add seeking back
-  const icon = mediaPlaying.isPlaying ? Icons.PAUSE : Icons.PLAY;
+  const icon =
+    mediaPlaying.isPlaying || mediaPlaying.isSeeking ? Icons.PAUSE : Icons.PLAY;
 
   return (
     <VideoPlayerIconButton