diff --git a/app/src/main/java/hu/bbara/purefin/player/ui/PlayerScreen.kt b/app/src/main/java/hu/bbara/purefin/player/ui/PlayerScreen.kt
index a23b3b9..897f783 100644
--- a/app/src/main/java/hu/bbara/purefin/player/ui/PlayerScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/player/ui/PlayerScreen.kt
@@ -170,7 +170,7 @@ fun PlayerScreen(
         }
 
         AnimatedVisibility(
-            visible = controlsVisible || uiState.isBuffering || uiState.isEnded || uiState.error != null,
+            visible = controlsVisible || uiState.isEnded || uiState.error != null,
             enter = fadeIn(),
             exit = fadeOut()
         ) {
diff --git a/app/src/main/java/hu/bbara/purefin/player/viewmodel/PlayerViewModel.kt b/app/src/main/java/hu/bbara/purefin/player/viewmodel/PlayerViewModel.kt
index 50f4804..9e30a7c 100644
--- a/app/src/main/java/hu/bbara/purefin/player/viewmodel/PlayerViewModel.kt
+++ b/app/src/main/java/hu/bbara/purefin/player/viewmodel/PlayerViewModel.kt
@@ -65,12 +65,7 @@ class PlayerViewModel @Inject constructor(
                         error = state.error ?: dataErrorMessage
                     )
                 }
-                if (state.isPlaying) {
-                    scheduleAutoHide()
-                } else {
-                    showControls()
-                }
-                if (state.isEnded || state.isBuffering) {
+                if (state.isEnded) {
                     showControls()
                 }
             }
@@ -174,16 +169,15 @@ class PlayerViewModel @Inject constructor(
 
     fun togglePlayPause() {
         playerManager.togglePlayPause()
+        showControls()
     }
 
     fun seekTo(positionMs: Long) {
         playerManager.seekTo(positionMs)
-        scheduleAutoHide()
     }
 
     fun seekBy(deltaMs: Long) {
         playerManager.seekBy(deltaMs)
-        scheduleAutoHide()
     }
 
     fun seekToLiveEdge() {