diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.css b/src/renderer/components/watch-video-playlist/watch-video-playlist.css
index 16b10972e08b8..e36f3a4bc0657 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.css
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.css
@@ -36,6 +36,8 @@
 }
 
 .playlistIcon {
+  height: 20px;
+  width: 20px;
   font-size: 20px;
   padding: 10px;
   margin-top: -25px;
diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.js b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
index 832b4f0cef3c8..6a854541b9e28 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.js
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
@@ -34,6 +34,7 @@ export default defineComponent({
       shuffleEnabled: false,
       loopEnabled: false,
       reversePlaylist: false,
+      pauseOnCurrentVideo: false,
       channelName: '',
       channelId: '',
       playlistTitle: '',
@@ -73,7 +74,7 @@ export default defineComponent({
       return !this.loopEnabled
     },
 
-    videoIsLastInInPlaylistItems: function() {
+    videoIsLastInInPlaylistItems: function () {
       if (this.shuffleEnabled) {
         return this.videoIndexInPlaylistItems === this.randomizedPlaylistItems.length - 1
       } else {
@@ -111,7 +112,7 @@ export default defineComponent({
         }
       }
     },
-    watchViewLoading: function(newVal, oldVal) {
+    watchViewLoading: function (newVal, oldVal) {
       // This component is loaded/rendered before watch view loaded
       if (oldVal && !newVal) {
         // Scroll after watch view loaded, otherwise doesn't work
@@ -120,7 +121,7 @@ export default defineComponent({
         this.scrollToCurrentVideo()
       }
     },
-    isLoading: function(newVal, oldVal) {
+    isLoading: function (newVal, oldVal) {
       // This component is loaded/rendered before watch view loaded
       if (oldVal && !newVal) {
         // Scroll after this component loaded, otherwise doesn't work
@@ -194,6 +195,16 @@ export default defineComponent({
       }, 1)
     },
 
+    togglePauseOnCurrentVideo: function () {
+      if (this.pauseOnCurrentVideo) {
+        this.pauseOnCurrentVideo = false
+        showToast(this.$t('Playlist will not pause when current video is finished'))
+      } else {
+        this.pauseOnCurrentVideo = true
+        showToast(this.$t('Playlist will pause when current video is finished'))
+      }
+    },
+
     playNextVideo: function () {
       const playlistInfo = {
         playlistId: this.playlistId
diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.vue b/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
index 10f71df5e25d8..c679eae6d340c 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
@@ -92,6 +92,17 @@
           @keydown.enter.prevent="playNextVideo"
           @keydown.space.prevent="playNextVideo"
         />
+        <font-awesome-icon
+          class="playlistIcon"
+          :class="{ playlistIconActive: pauseOnCurrentVideo }"
+          :icon="['fas', 'pause']"
+          :title="$t('Video.Pause on Current Video')"
+          role="button"
+          tabindex="0"
+          @click="togglePauseOnCurrentVideo"
+          @keydown.enter.prevent="togglePauseOnCurrentVideo"
+          @keydown.space.prevent="togglePauseOnCurrentVideo"
+        />
       </p>
       <div
         v-if="!isLoading"
diff --git a/src/renderer/main.js b/src/renderer/main.js
index 06a7999dd94cb..8e43db2487d5c 100644
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -37,6 +37,7 @@ import {
   faLanguage,
   faList,
   faNewspaper,
+  faPause,
   faPlay,
   faQuestionCircle,
   faRandom,
@@ -103,6 +104,7 @@ library.add(
   faLanguage,
   faList,
   faNewspaper,
+  faPause,
   faPlay,
   faQuestionCircle,
   faRandom,
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index e5e8628eaece8..507a45384b37f 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -183,7 +183,7 @@ export default defineComponent({
     hideVideoDescription: function () {
       return this.$store.getters.getHideVideoDescription
     },
-    showFamilyFriendlyOnly: function() {
+    showFamilyFriendlyOnly: function () {
       return this.$store.getters.getShowFamilyFriendlyOnly
     },
     hideChannelSubscriptions: function () {
@@ -1079,6 +1079,10 @@ export default defineComponent({
     },
 
     checkIfPlaylist: function () {
+      // On the off chance that user selected pause on current video
+      // Then clicks on another video in the playlist
+      this.disablePlaylistPauseOnCurrent()
+
       if (typeof (this.$route.query) !== 'undefined') {
         this.playlistId = this.$route.query.playlistId
 
@@ -1210,6 +1214,11 @@ export default defineComponent({
         return
       }
 
+      if (this.watchingPlaylist && this.getPlaylistPauseOnCurrent()) {
+        this.disablePlaylistPauseOnCurrent()
+        return
+      }
+
       if (this.watchingPlaylist && this.$refs.watchVideoPlaylist.shouldStopDueToPlaylistEnd) {
         // Let `watchVideoPlaylist` handle end of playlist, no countdown needed
         this.$refs.watchVideoPlaylist.playNextVideo()
@@ -1392,7 +1401,7 @@ export default defineComponent({
       ]
     },
 
-    getAdaptiveFormatsInvidious: async function(existingInfoResult = null) {
+    getAdaptiveFormatsInvidious: async function (existingInfoResult = null) {
       let result
       if (existingInfoResult) {
         result = existingInfoResult
@@ -1561,6 +1570,16 @@ export default defineComponent({
       return this.$refs.watchVideoPlaylist ? this.$refs.watchVideoPlaylist.loopEnabled : false
     },
 
+    getPlaylistPauseOnCurrent: function () {
+      return this.$refs.watchVideoPlaylist ? this.$refs.watchVideoPlaylist.pauseOnCurrentVideo : false
+    },
+
+    disablePlaylistPauseOnCurrent: function () {
+      if (this.$refs.watchVideoPlaylist) {
+        this.$refs.watchVideoPlaylist.pauseOnCurrentVideo = false
+      }
+    },
+
     updateTitle: function () {
       document.title = `${this.videoTitle} - FreeTube`
     },
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index 85c4f31ba030a..79e7fe91a9625 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -615,6 +615,7 @@ Video:
   Reverse Playlist: Reverse Playlist
   Play Next Video: Play Next Video
   Play Previous Video: Play Previous Video
+  Pause on Current Video: Pause on Current Video
   # Context is "X People Watching"
   Watching: Watching
   Watched: Watched
@@ -886,6 +887,8 @@ Shuffle is now enabled: Shuffle is now enabled
 The playlist has been reversed: The playlist has been reversed
 Playing Next Video: Playing Next Video
 Playing Previous Video: Playing Previous Video
+Playlist will not pause when current video is finished: Playlist will not pause when current video is finished
+Playlist will pause when current video is finished: Playlist will pause when current video is finished
 Playing Next Video Interval: Playing next video in no time. Click to cancel. | Playing next video in {nextVideoInterval} second. Click to cancel. | Playing next video in {nextVideoInterval} seconds. Click to cancel.
 Canceled next video autoplay: Canceled next video autoplay