diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
index 9576825ed..68dc6687a 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
@@ -73,8 +73,8 @@ class ViewVideoFragment : ViewMediaFragment() {
         super.onResume()
 
         if (_binding != null) {
-            if (mediaActivity.isToolbarVisible) {
-                handler.postDelayed(hideToolbar, TOOLBAR_HIDE_DELAY_MS)
+            if (mediaActivity.isToolbarVisible && !isAudio) {
+                hideToolbarAfterDelay(TOOLBAR_HIDE_DELAY_MS)
             }
             binding.videoView.start()
         }
@@ -130,18 +130,17 @@ class ViewVideoFragment : ViewMediaFragment() {
         binding.videoView.setMediaController(mediaController)
         binding.videoView.requestFocus()
         binding.videoView.setPlayPauseListener(object : ExposedPlayPauseVideoView.PlayPauseListener {
-            override fun onPause() {
-                handler.removeCallbacks(hideToolbar)
-            }
             override fun onPlay() {
-                // Audio doesn't cause the controller to show automatically,
-                // and we only want to hide the toolbar if it's a video.
-                if (isAudio) {
-                    mediaController.show()
-                } else {
+                if (!isAudio) {
                     hideToolbarAfterDelay(TOOLBAR_HIDE_DELAY_MS)
                 }
             }
+
+            override fun onPause() {
+                if (!isAudio) {
+                    handler.removeCallbacks(hideToolbar)
+                }
+            }
         })
         binding.videoView.setOnPreparedListener { mp ->
             val containerWidth = binding.videoContainer.measuredWidth.toFloat()
@@ -167,6 +166,11 @@ class ViewVideoFragment : ViewMediaFragment() {
                 false
             }
 
+            // Audio doesn't cause the controller to show automatically
+            if (isAudio) {
+                mediaController.show()
+            }
+
             binding.progressBar.hide()
             mp.isLooping = true
         }