diff --git a/src/renderer/components/ft-element-list/ft-element-list.js b/src/renderer/components/ft-element-list/ft-element-list.js
index 642b928f65748..c505a915f0b50 100644
--- a/src/renderer/components/ft-element-list/ft-element-list.js
+++ b/src/renderer/components/ft-element-list/ft-element-list.js
@@ -33,7 +33,12 @@ export default defineComponent({
     hideForbiddenTitles: {
       type: Boolean,
       default: true
-    }
+    },
+    searchQueryText: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   computed: {
     listType: function () {
diff --git a/src/renderer/components/ft-element-list/ft-element-list.vue b/src/renderer/components/ft-element-list/ft-element-list.vue
index 8b0410a570baf..79eaffebb901f 100644
--- a/src/renderer/components/ft-element-list/ft-element-list.vue
+++ b/src/renderer/components/ft-element-list/ft-element-list.vue
@@ -13,6 +13,7 @@
       :show-video-with-last-viewed-playlist="showVideoWithLastViewedPlaylist"
       :use-channels-hidden-preference="useChannelsHiddenPreference"
       :hide-forbidden-titles="hideForbiddenTitles"
+      :search-query-text="searchQueryText"
     />
   </ft-auto-grid>
 </template>
diff --git a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
index 939c949d16342..32a4012373b9e 100644
--- a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
+++ b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
@@ -47,6 +47,11 @@ export default defineComponent({
       type: Boolean,
       default: true
     },
+    searchQueryText: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   data: function () {
     return {
diff --git a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue
index 654d6bbde5aa8..c5f734c937696 100644
--- a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue
+++ b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue
@@ -28,6 +28,7 @@
         v-else-if="finalDataType === 'playlist'"
         :appearance="appearance"
         :data="data"
+        :search-query-text="searchQueryText"
       />
       <ft-community-post
         v-else-if="finalDataType === 'community'"
diff --git a/src/renderer/components/ft-list-playlist/ft-list-playlist.js b/src/renderer/components/ft-list-playlist/ft-list-playlist.js
index 30ff916bc3372..2ac0f5bafda8d 100644
--- a/src/renderer/components/ft-list-playlist/ft-list-playlist.js
+++ b/src/renderer/components/ft-list-playlist/ft-list-playlist.js
@@ -15,7 +15,12 @@ export default defineComponent({
     appearance: {
       type: String,
       required: true
-    }
+    },
+    searchQueryText: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   data: function () {
     return {
@@ -79,6 +84,7 @@ export default defineComponent({
         path: `/playlist/${this.playlistId}`,
         query: {
           playlistType: this.isUserPlaylist ? 'user' : '',
+          searchQueryText: this.searchQueryText,
         },
       }
     },
diff --git a/src/renderer/components/ft-playlist-add-video-prompt/ft-playlist-add-video-prompt.css b/src/renderer/components/ft-playlist-add-video-prompt/ft-playlist-add-video-prompt.css
index 7fccec88d65f4..fa65984ce5534 100644
--- a/src/renderer/components/ft-playlist-add-video-prompt/ft-playlist-add-video-prompt.css
+++ b/src/renderer/components/ft-playlist-add-video-prompt/ft-playlist-add-video-prompt.css
@@ -16,6 +16,36 @@
   flex-direction: column;
 }
 
+.searchInputsRow {
+  display: grid;
+
+  /* 2 columns */
+  grid-template-columns: 1fr auto;
+  column-gap: 16px;
+}
+@media only screen and (max-width: 800px) {
+  .searchInputsRow {
+    /* Switch to 2 rows from 2 columns */
+    grid-template-columns: auto;
+    grid-template-rows: auto auto;
+  }
+}
+
+.optionsRow {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  grid-template-rows: 1fr;
+  align-items: center;
+}
+@media only screen and (max-width: 800px) {
+  .optionsRow {
+    /* Switch to 2 rows from 2 columns */
+    grid-template-columns: auto;
+    grid-template-rows: auto auto;
+    align-items: stretch;
+  }
+}
+
 .sortSelect {
   /* Put it on the right */
   margin-inline-start: auto;
diff --git a/src/renderer/components/ft-playlist-add-video-prompt/ft-playlist-add-video-prompt.js b/src/renderer/components/ft-playlist-add-video-prompt/ft-playlist-add-video-prompt.js
index 958fe07ffcca3..9a1d9a118bcc8 100644
--- a/src/renderer/components/ft-playlist-add-video-prompt/ft-playlist-add-video-prompt.js
+++ b/src/renderer/components/ft-playlist-add-video-prompt/ft-playlist-add-video-prompt.js
@@ -7,6 +7,7 @@ import FtButton from '../ft-button/ft-button.vue'
 import FtPlaylistSelector from '../ft-playlist-selector/ft-playlist-selector.vue'
 import FtInput from '../../components/ft-input/ft-input.vue'
 import FtSelect from '../../components/ft-select/ft-select.vue'
+import FtToggleSwitch from '../../components/ft-toggle-switch/ft-toggle-switch.vue'
 import {
   showToast,
 } from '../../helpers/utils'
@@ -31,12 +32,14 @@ export default defineComponent({
     'ft-playlist-selector': FtPlaylistSelector,
     'ft-input': FtInput,
     'ft-select': FtSelect,
+    'ft-toggle-switch': FtToggleSwitch,
   },
   data: function () {
     return {
       selectedPlaylistIdList: [],
       createdSincePromptShownPlaylistIdList: [],
       query: '',
+      doSearchPlaylistsWithMatchingVideos: false,
       updateQueryDebounce: function() {},
       lastShownAt: Date.now(),
       lastActiveElement: null,
@@ -115,6 +118,12 @@ export default defineComponent({
       return this.allPlaylists.filter((playlist) => {
         if (typeof (playlist.playlistName) !== 'string') { return false }
 
+        if (this.doSearchPlaylistsWithMatchingVideos) {
+          if (playlist.videos.some((v) => v.title.toLowerCase().includes(this.processedQuery))) {
+            return true
+          }
+        }
+
         return playlist.playlistName.toLowerCase().includes(this.processedQuery)
       })
     },
diff --git a/src/renderer/components/ft-playlist-add-video-prompt/ft-playlist-add-video-prompt.vue b/src/renderer/components/ft-playlist-add-video-prompt/ft-playlist-add-video-prompt.vue
index e169fd0156f1d..92dd088056b78 100644
--- a/src/renderer/components/ft-playlist-add-video-prompt/ft-playlist-add-video-prompt.vue
+++ b/src/renderer/components/ft-playlist-add-video-prompt/ft-playlist-add-video-prompt.vue
@@ -12,23 +12,37 @@
         playlistCount: selectedPlaylistCount,
       }) }}
     </p>
-    <ft-input
-      ref="searchBar"
-      :placeholder="$t('User Playlists.AddVideoPrompt.Search in Playlists')"
-      :show-clear-text-button="true"
-      :show-action-button="false"
-      @input="(input) => updateQueryDebounce(input)"
-      @clear="updateQueryDebounce('')"
-    />
-    <ft-select
-      v-if="allPlaylists.length > 1"
-      class="sortSelect"
-      :value="sortBy"
-      :select-names="sortBySelectNames"
-      :select-values="sortBySelectValues"
-      :placeholder="$t('User Playlists.Sort By.Sort By')"
-      @change="sortBy = $event"
-    />
+    <div
+      class="searchInputsRow"
+    >
+      <ft-input
+        ref="searchBar"
+        :placeholder="$t('User Playlists.AddVideoPrompt.Search in Playlists')"
+        :show-clear-text-button="true"
+        :show-action-button="false"
+        @input="(input) => updateQueryDebounce(input)"
+        @clear="updateQueryDebounce('')"
+      />
+    </div>
+    <div
+      class="optionsRow"
+    >
+      <ft-toggle-switch
+        :label="$t('User Playlists.Playlists with Matching Videos')"
+        :compact="true"
+        :default-value="doSearchPlaylistsWithMatchingVideos"
+        @change="doSearchPlaylistsWithMatchingVideos = !doSearchPlaylistsWithMatchingVideos"
+      />
+      <ft-select
+        v-if="allPlaylists.length > 1"
+        class="sortSelect"
+        :value="sortBy"
+        :select-names="sortBySelectNames"
+        :select-values="sortBySelectValues"
+        :placeholder="$t('User Playlists.Sort By.Sort By')"
+        @change="sortBy = $event"
+      />
+    </div>
     <div class="playlists-container">
       <ft-flex-box>
         <div
diff --git a/src/renderer/components/playlist-info/playlist-info.js b/src/renderer/components/playlist-info/playlist-info.js
index 52d9198408e9d..eb47b19db6daa 100644
--- a/src/renderer/components/playlist-info/playlist-info.js
+++ b/src/renderer/components/playlist-info/playlist-info.js
@@ -83,6 +83,18 @@ export default defineComponent({
       type: Boolean,
       required: true,
     },
+    searchVideoModeAllowed: {
+      type: Boolean,
+      required: true,
+    },
+    searchVideoModeEnabled: {
+      type: Boolean,
+      required: true,
+    },
+    searchQueryText: {
+      type: String,
+      required: true,
+    },
   },
   data: function () {
     return {
@@ -239,6 +251,12 @@ export default defineComponent({
     this.newTitle = this.title
     this.newDescription = this.description
 
+    if (this.videoCount > 0) {
+      // Only enable search video mode when viewing non empty playlists
+      this.searchVideoMode = this.searchVideoModeEnabled
+      this.query = this.searchQueryText
+    }
+
     this.updateQueryDebounce = debounce(this.updateQuery, 500)
   },
   methods: {
diff --git a/src/renderer/components/playlist-info/playlist-info.vue b/src/renderer/components/playlist-info/playlist-info.vue
index 4f25a297a7754..56a76742a5aca 100644
--- a/src/renderer/components/playlist-info/playlist-info.vue
+++ b/src/renderer/components/playlist-info/playlist-info.vue
@@ -108,7 +108,7 @@
 
       <div class="playlistOptions">
         <ft-icon-button
-          v-if="isUserPlaylist && videoCount > 0 && !editMode"
+          v-if="searchVideoModeAllowed && videoCount > 0 && !editMode"
           ref="enableSearchModeButton"
           :title="$t('User Playlists.SinglePlaylistView.Search for Videos')"
           :icon="['fas', 'search']"
@@ -198,7 +198,7 @@
     </div>
 
     <div
-      v-if="isUserPlaylist && searchVideoMode"
+      v-if="searchVideoModeAllowed && searchVideoMode"
       class="searchInputsRow"
     >
       <ft-input
@@ -207,11 +207,11 @@
         :placeholder="$t('User Playlists.SinglePlaylistView.Search for Videos')"
         :show-clear-text-button="true"
         :show-action-button="false"
+        :value="query"
         @input="(input) => updateQueryDebounce(input)"
         @clear="updateQueryDebounce('')"
       />
       <ft-icon-button
-        v-if="isUserPlaylist && searchVideoMode"
         :title="$t('User Playlists.Cancel')"
         :icon="['fas', 'times']"
         theme="secondary"
diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
index 7f2bb449a937d..936f96abebbdb 100644
--- a/src/renderer/views/Playlist/Playlist.js
+++ b/src/renderer/views/Playlist/Playlist.js
@@ -113,6 +113,17 @@ export default defineComponent({
       }
     },
 
+    searchVideoModeAllowed() {
+      return this.isUserPlaylistRequested
+    },
+    searchQueryTextRequested() {
+      return this.$route.query.searchQueryText
+    },
+    searchQueryTextPresent() {
+      const searchQueryText = this.searchQueryTextRequested
+      return typeof searchQueryText === 'string' && searchQueryText !== ''
+    },
+
     isUserPlaylistRequested: function () {
       return this.$route.query.playlistType === 'user'
     },
@@ -181,6 +192,11 @@ export default defineComponent({
   },
   created: function () {
     this.getPlaylistInfoDebounce = debounce(this.getPlaylistInfo, 100)
+
+    if (this.searchVideoModeAllowed && this.searchQueryTextPresent) {
+      this.playlistInVideoSearchMode = true
+      this.videoSearchQuery = this.searchQueryTextRequested
+    }
   },
   mounted: function () {
     this.getPlaylistInfoDebounce()
diff --git a/src/renderer/views/Playlist/Playlist.vue b/src/renderer/views/Playlist/Playlist.vue
index 2d93f542a9f1b..f4e3c183ba67c 100644
--- a/src/renderer/views/Playlist/Playlist.vue
+++ b/src/renderer/views/Playlist/Playlist.vue
@@ -22,6 +22,9 @@
       :view-count="viewCount"
       :info-source="infoSource"
       :more-video-data-available="moreVideoDataAvailable"
+      :search-video-mode-allowed="searchVideoModeAllowed"
+      :search-video-mode-enabled="playlistInVideoSearchMode"
+      :search-query-text="searchQueryTextRequested"
       class="playlistInfo"
       :class="{
         promptOpen,
diff --git a/src/renderer/views/UserPlaylists/UserPlaylists.css b/src/renderer/views/UserPlaylists/UserPlaylists.css
index c7cea712b6be2..d0da46adb028a 100644
--- a/src/renderer/views/UserPlaylists/UserPlaylists.css
+++ b/src/renderer/views/UserPlaylists/UserPlaylists.css
@@ -16,6 +16,36 @@
   vertical-align: middle;
 }
 
+.searchInputsRow {
+  display: grid;
+
+  /* 2 columns */
+  grid-template-columns: 1fr auto;
+  column-gap: 16px;
+}
+@media only screen and (max-width: 800px) {
+  .searchInputsRow {
+    /* Switch to 2 rows from 2 columns */
+    grid-template-columns: auto;
+    grid-template-rows: auto auto;
+  }
+}
+
+.optionsRow {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  grid-template-rows: 1fr;
+  align-items: center;
+}
+@media only screen and (max-width: 800px) {
+  .optionsRow {
+    /* Switch to 2 rows from 2 columns */
+    grid-template-columns: auto;
+    grid-template-rows: auto auto;
+    align-items: stretch;
+  }
+}
+
 .sortSelect {
   /* Put it on the right */
   margin-inline-start: auto;
diff --git a/src/renderer/views/UserPlaylists/UserPlaylists.js b/src/renderer/views/UserPlaylists/UserPlaylists.js
index 95e2d01c862cc..e4d7f3f2888e3 100644
--- a/src/renderer/views/UserPlaylists/UserPlaylists.js
+++ b/src/renderer/views/UserPlaylists/UserPlaylists.js
@@ -10,6 +10,7 @@ import FtSelect from '../../components/ft-select/ft-select.vue'
 import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
 import FtInput from '../../components/ft-input/ft-input.vue'
 import FtIconButton from '../../components/ft-icon-button/ft-icon-button.vue'
+import FtToggleSwitch from '../../components/ft-toggle-switch/ft-toggle-switch.vue'
 
 const SORT_BY_VALUES = {
   NameAscending: 'name_ascending',
@@ -37,6 +38,7 @@ export default defineComponent({
     'ft-element-list': FtElementList,
     'ft-icon-button': FtIconButton,
     'ft-input': FtInput,
+    'ft-toggle-switch': FtToggleSwitch,
   },
   data: function () {
     return {
@@ -45,6 +47,7 @@ export default defineComponent({
       searchDataLimit: 100,
       showLoadMoreButton: false,
       query: '',
+      doSearchPlaylistsWithMatchingVideos: false,
       activeData: [],
       sortBy: SORT_BY_VALUES.LatestPlayedFirst,
     }
@@ -165,6 +168,10 @@ export default defineComponent({
       this.searchDataLimit = 100
       this.filterPlaylistAsync()
     },
+    doSearchPlaylistsWithMatchingVideos() {
+      this.searchDataLimit = 100
+      this.filterPlaylistAsync()
+    },
     fullData() {
       this.activeData = this.fullData
       this.filterPlaylist()
@@ -209,15 +216,22 @@ export default defineComponent({
       if (this.lowerCaseQuery === '') {
         this.activeData = this.fullData
         this.showLoadMoreButton = this.allPlaylists.length > this.activeData.length
-      } else {
-        const filteredPlaylists = this.allPlaylists.filter((playlist) => {
-          if (typeof (playlist.playlistName) !== 'string') { return false }
-
-          return playlist.playlistName.toLowerCase().includes(this.lowerCaseQuery)
-        })
-        this.showLoadMoreButton = filteredPlaylists.length > this.searchDataLimit
-        this.activeData = filteredPlaylists.length < this.searchDataLimit ? filteredPlaylists : filteredPlaylists.slice(0, this.searchDataLimit)
+        return
       }
+
+      const filteredPlaylists = this.allPlaylists.filter((playlist) => {
+        if (typeof (playlist.playlistName) !== 'string') { return false }
+
+        if (this.doSearchPlaylistsWithMatchingVideos) {
+          if (playlist.videos.some((v) => v.title.toLowerCase().includes(this.lowerCaseQuery))) {
+            return true
+          }
+        }
+
+        return playlist.playlistName.toLowerCase().includes(this.lowerCaseQuery)
+      })
+      this.showLoadMoreButton = filteredPlaylists.length > this.searchDataLimit
+      this.activeData = filteredPlaylists.length < this.searchDataLimit ? filteredPlaylists : filteredPlaylists.slice(0, this.searchDataLimit)
     },
 
     createNewPlaylist: function () {
diff --git a/src/renderer/views/UserPlaylists/UserPlaylists.vue b/src/renderer/views/UserPlaylists/UserPlaylists.vue
index 3735dfaef2f17..60a444df560e5 100644
--- a/src/renderer/views/UserPlaylists/UserPlaylists.vue
+++ b/src/renderer/views/UserPlaylists/UserPlaylists.vue
@@ -19,24 +19,39 @@
           class="newPlaylistButton"
           @click="createNewPlaylist"
         />
-        <ft-input
+        <div
           v-if="fullData.length > 1"
-          ref="searchBar"
-          :placeholder="$t('User Playlists.Search bar placeholder')"
-          :show-clear-text-button="true"
-          :show-action-button="false"
-          @input="(input) => query = input"
-          @clear="query = ''"
-        />
-        <ft-select
-          v-if="fullData.length > 1"
-          class="sortSelect"
-          :value="sortBy"
-          :select-names="sortBySelectNames"
-          :select-values="sortBySelectValues"
-          :placeholder="$t('User Playlists.Sort By.Sort By')"
-          @change="sortBy = $event"
-        />
+          class="searchInputsRow"
+        >
+          <ft-input
+            ref="searchBar"
+            :placeholder="$t('User Playlists.Search bar placeholder')"
+            :show-clear-text-button="true"
+            :show-action-button="false"
+            @input="(input) => query = input"
+            @clear="query = ''"
+          />
+        </div>
+        <div
+          class="optionsRow"
+        >
+          <ft-toggle-switch
+            v-if="fullData.length > 1"
+            :label="$t('User Playlists.Playlists with Matching Videos')"
+            :compact="true"
+            :default-value="doSearchPlaylistsWithMatchingVideos"
+            @change="doSearchPlaylistsWithMatchingVideos = !doSearchPlaylistsWithMatchingVideos"
+          />
+          <ft-select
+            v-if="fullData.length > 1"
+            class="sortSelect"
+            :value="sortBy"
+            :select-names="sortBySelectNames"
+            :select-values="sortBySelectValues"
+            :placeholder="$t('User Playlists.Sort By.Sort By')"
+            @change="sortBy = $event"
+          />
+        </div>
       </div>
       <ft-flex-box
         v-if="fullData.length === 0"
@@ -56,6 +71,7 @@
         v-else-if="activeData.length > 0 && !isLoading"
         :data="activeData"
         :data-type="'playlist'"
+        :search-query-text="doSearchPlaylistsWithMatchingVideos ? lowerCaseQuery : ''"
         :use-channels-hidden-preference="false"
         :hide-forbidden-titles="false"
       />
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index 24bb284dee38f..60f91e35637c6 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -143,7 +143,8 @@ User Playlists:
     it listed here
   You have no playlists. Click on the create new playlist button to create a new one.: You have no playlists. Click on the create new playlist button to create a new one.
   Empty Search Message: There are no videos in this playlist that matches your search
-  Search bar placeholder: Search in Playlist
+  Search bar placeholder: Search for Playlists
+  Playlists with Matching Videos: Playlists with Matching Videos
 
   This playlist currently has no videos.: This playlist currently has no videos.