diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
index cdafc6bce..132689d6e 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -398,8 +398,21 @@ class PlayerFragment : BaseFragment() {
 
     private val playerOptionsInterface = object : PlayerOptionsInterface {
         override fun onAutoplayClicked() {
-            // toggle autoplay
-            autoplayEnabled = !autoplayEnabled
+            // autoplay options dialog
+            MaterialAlertDialogBuilder(requireContext())
+                .setTitle(R.string.player_autoplay)
+                .setItems(
+                    arrayOf(
+                        context?.getString(R.string.enabled),
+                        context?.getString(R.string.disabled)
+                    )
+                ) { _, index ->
+                    when (index) {
+                        0 -> autoplayEnabled = true
+                        1 -> autoplayEnabled = false
+                    }
+                }
+                .show()
         }
 
         override fun onCaptionClicked() {
@@ -494,26 +507,43 @@ class PlayerFragment : BaseFragment() {
 
         override fun onAspectRatioClicked() {
             // switching between original aspect ratio (black bars) and zoomed to fill device screen
+            val aspectRatioModeNames = arrayOf(
+                context?.getString(R.string.resize_mode_fit),
+                context?.getString(R.string.resize_mode_zoom),
+                context?.getString(R.string.resize_mode_fill)
+            )
+
             val aspectRatioModes = arrayOf(
                 AspectRatioFrameLayout.RESIZE_MODE_FIT,
                 AspectRatioFrameLayout.RESIZE_MODE_ZOOM,
                 AspectRatioFrameLayout.RESIZE_MODE_FILL
             )
-            val index = aspectRatioModes.indexOf(exoPlayerView.resizeMode)
-            val newAspectRatioMode =
-                if (index + 1 < aspectRatioModes.size) aspectRatioModes[index + 1]
-                else aspectRatioModes[0]
-            exoPlayerView.resizeMode = newAspectRatioMode
+
+            MaterialAlertDialogBuilder(requireContext())
+                .setTitle(R.string.aspect_ratio)
+                .setItems(aspectRatioModeNames) { _, index ->
+                    exoPlayerView.resizeMode = aspectRatioModes[index]
+                }
+                .show()
         }
 
         override fun onRepeatModeClicked() {
-            // repeat toggle button
-            if (exoPlayer.repeatMode == RepeatModeUtil.REPEAT_TOGGLE_MODE_ALL) {
-                // turn off repeat mode
-                exoPlayer.repeatMode = RepeatModeUtil.REPEAT_TOGGLE_MODE_NONE
-            } else {
-                exoPlayer.repeatMode = RepeatModeUtil.REPEAT_TOGGLE_MODE_ALL
-            }
+            val repeatModeNames = arrayOf(
+                context?.getString(R.string.repeat_mode_none),
+                context?.getString(R.string.repeat_mode_current)
+            )
+
+            val repeatModes = arrayOf(
+                RepeatModeUtil.REPEAT_TOGGLE_MODE_ALL,
+                RepeatModeUtil.REPEAT_TOGGLE_MODE_NONE
+            )
+            // repeat mode options dialog
+            MaterialAlertDialogBuilder(requireContext())
+                .setTitle(R.string.repeat_mode)
+                .setItems(repeatModeNames) { _, index ->
+                    exoPlayer.repeatMode = repeatModes[index]
+                }
+                .show()
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 790b350b0..534add96f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -217,7 +217,7 @@
     <string name="github">GitHub</string>
     <string name="audio_video">Audio and video</string>
     <string name="fullscreen_orientation">Fullscreen orientation</string>
-    <string name="aspect_ratio">Aspect ratio for videos</string>
+    <string name="aspect_ratio">Video aspect ratio</string>
     <string name="auto_rotation">Auto-rotation</string>
     <string name="landscape">Landscape</string>
     <string name="portrait">Portrait</string>
@@ -305,4 +305,9 @@
     <string name="yt_shorts">Shorts</string>
     <string name="no_subtitles_available">No subtitles available</string>
     <string name="repeat_mode">Repeat Mode</string>
+    <string name="resize_mode_fit">Fit</string>
+    <string name="resize_mode_fill">Fill</string>
+    <string name="resize_mode_zoom">Zoom</string>
+    <string name="repeat_mode_none">None</string>
+    <string name="repeat_mode_current">Current</string>
 </resources>