diff --git a/client/components/modals/podcast/EpisodeFeed.vue b/client/components/modals/podcast/EpisodeFeed.vue
index 91f0b34a..c8be0345 100644
--- a/client/components/modals/podcast/EpisodeFeed.vue
+++ b/client/components/modals/podcast/EpisodeFeed.vue
@@ -6,9 +6,14 @@
       </div>
     </template>
     <div ref="wrapper" id="podcast-wrapper" class="p-4 w-full text-sm py-2 rounded-lg bg-bg shadow-lg border border-black-300 relative overflow-hidden">
+      <div v-if="episodes.length" class="w-full py-3 mx-auto flex">
+        <form @submit.prevent="submit" class="flex flex-grow">
+          <ui-text-input v-model="search" @input="inputUpdate" type="search" :placeholder="$strings.PlaceholderSearchEpisode" class="flex-grow mr-2 text-sm md:text-base" />
+        </form>
+      </div>
       <div ref="episodeContainer" id="episodes-scroll" class="w-full overflow-x-hidden overflow-y-auto">
         <div
-          v-for="(episode, index) in episodes"
+          v-for="(episode, index) in episodesList"
           :key="index"
           class="relative"
           :class="itemEpisodeMap[episode.enclosure.url] ? 'bg-primary bg-opacity-40' : selectedEpisodes[String(index)] ? 'cursor-pointer bg-success bg-opacity-10' : index % 2 == 0 ? 'cursor-pointer bg-primary bg-opacity-25 hover:bg-opacity-40' : 'cursor-pointer bg-primary bg-opacity-5 hover:bg-opacity-25'"
@@ -59,7 +64,10 @@ export default {
     return {
       processing: false,
       selectedEpisodes: {},
-      selectAll: false
+      selectAll: false,
+      search: null,
+      searchTimeout: null,
+      searchText: null,
     }
   },
   watch: {
@@ -103,9 +111,28 @@ export default {
         if (item.enclosure) map[item.enclosure.url] = true
       })
       return map
+    },
+    episodesList() {
+      return this.episodes.filter((episode) => {
+        if (!this.searchText) return true
+        return (
+          (episode.title && episode.title.toLowerCase().includes(this.searchText)) ||
+          (episode.subtitle && episode.subtitle.toLowerCase().includes(this.searchText))
+        )
+      })
     }
   },
   methods: {
+    inputUpdate() {
+      clearTimeout(this.searchTimeout)
+      this.searchTimeout = setTimeout(() => {
+        if (!this.search || !this.search.trim()) {
+          this.searchText = ''
+          return
+        }
+        this.searchText = this.search.toLowerCase().trim()
+      }, 500)
+    },
     toggleSelectAll(val) {
       for (let i = 0; i < this.episodes.length; i++) {
         const episode = this.episodes[i]
diff --git a/client/components/tables/podcast/EpisodesTable.vue b/client/components/tables/podcast/EpisodesTable.vue
index d92f3181..a5af04cd 100644
--- a/client/components/tables/podcast/EpisodesTable.vue
+++ b/client/components/tables/podcast/EpisodesTable.vue
@@ -19,7 +19,12 @@
       </template>
     </div>
     <p v-if="!episodes.length" class="py-4 text-center text-lg">{{ $strings.MessageNoEpisodes }}</p>
-    <template v-for="episode in episodesSorted">
+    <div v-if="episodes.length" class="w-full py-3 mx-auto flex">
+      <form @submit.prevent="submit" class="flex flex-grow">
+        <ui-text-input v-model="search" @input="inputUpdate" type="search" :placeholder="$strings.PlaceholderSearchEpisode" class="flex-grow mr-2 text-sm md:text-base" />
+      </form>
+    </div>
+    <template v-for="episode in episodesList">
       <tables-podcast-episode-table-row ref="episodeRow" :key="episode.id" :episode="episode" :library-item-id="libraryItem.id" :selection-mode="isSelectionMode" class="item" @play="playEpisode" @remove="removeEpisode" @edit="editEpisode" @view="viewEpisode" @selected="episodeSelected" @addToQueue="addEpisodeToQueue" @addToPlaylist="addToPlaylist" />
     </template>
 
@@ -46,7 +51,10 @@ export default {
       selectedEpisodes: [],
       episodesToRemove: [],
       processing: false,
-      quickMatchingEpisodes: false
+      quickMatchingEpisodes: false,
+      search: null,
+      searchTimeout: null,
+      searchText: null,
     }
   },
   watch: {
@@ -137,6 +145,15 @@ export default {
           return String(a[this.sortKey]).localeCompare(String(b[this.sortKey]), undefined, { numeric: true, sensitivity: 'base' })
         })
     },
+    episodesList() {
+      return this.episodesSorted.filter((episode) => {
+        if (!this.searchText) return true
+        return (
+            (episode.title && episode.title.toLowerCase().includes(this.searchText)) ||
+            (episode.subtitle && episode.subtitle.toLowerCase().includes(this.searchText))
+        )
+      })
+    },
     selectedIsFinished() {
       // Find an item that is not finished, if none then all items finished
       return !this.selectedEpisodes.find((episode) => {
@@ -152,6 +169,16 @@ export default {
     }
   },
   methods: {
+    inputUpdate() {
+      clearTimeout(this.searchTimeout)
+      this.searchTimeout = setTimeout(() => {
+        if (!this.search || !this.search.trim()) {
+          this.searchText = ''
+          return
+        }
+        this.searchText = this.search.toLowerCase().trim()
+      }, 500)
+    },
     contextMenuAction(action) {
       if (action === 'quick-match-episodes') {
         if (this.quickMatchingEpisodes) return
diff --git a/client/package-lock.json b/client/package-lock.json
index aa308947..247c6fa3 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.2.16",
+  "version": "2.2.17",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "audiobookshelf-client",
-      "version": "2.2.16",
+      "version": "2.2.17",
       "license": "ISC",
       "dependencies": {
         "@nuxtjs/axios": "^5.13.6",
diff --git a/client/package.json b/client/package.json
index 63aec8a6..0fafb156 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.2.16",
+  "version": "2.2.17",
   "description": "Self-hosted audiobook and podcast client",
   "main": "index.js",
   "scripts": {
diff --git a/client/strings/de.json b/client/strings/de.json
index 444f1d14..a829ffa5 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -566,6 +566,7 @@
   "PlaceholderNewFolderPath": "Neuer Ordnerpfad",
   "PlaceholderNewPlaylist": "Neuer Wiedergabelistenname",
   "PlaceholderSearch": "Suche...",
+  "PlaceholderSearchEpisode": "Search episode...",
   "ToastAccountUpdateFailed": "Aktualisierung des Kontos fehlgeschlagen",
   "ToastAccountUpdateSuccess": "Konto aktualisiert",
   "ToastAuthorImageRemoveFailed": "Bild konnte nicht entfernt werden",
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index 801b5ab2..2c829514 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -566,6 +566,7 @@
   "PlaceholderNewFolderPath": "New folder path",
   "PlaceholderNewPlaylist": "New playlist name",
   "PlaceholderSearch": "Search..",
+  "PlaceholderSearchEpisode": "Search episode..",
   "ToastAccountUpdateFailed": "Failed to update account",
   "ToastAccountUpdateSuccess": "Account updated",
   "ToastAuthorImageRemoveFailed": "Failed to remove image",
@@ -635,4 +636,4 @@
   "ToastSocketFailedToConnect": "Socket failed to connect",
   "ToastUserDeleteFailed": "Failed to delete user",
   "ToastUserDeleteSuccess": "User deleted"
-}
\ No newline at end of file
+}
diff --git a/client/strings/es.json b/client/strings/es.json
index f40e4cc1..5d0f198c 100644
--- a/client/strings/es.json
+++ b/client/strings/es.json
@@ -566,6 +566,7 @@
   "PlaceholderNewFolderPath": "Nueva ruta de carpeta",
   "PlaceholderNewPlaylist": "Nuevo nombre de la lista de reproducción",
   "PlaceholderSearch": "Buscando..",
+  "PlaceholderSearchEpisode": "Search episode..",
   "ToastAccountUpdateFailed": "Error al actualizar cuenta",
   "ToastAccountUpdateSuccess": "Cuenta actualizada",
   "ToastAuthorImageRemoveFailed": "Error al eliminar la imagen",
diff --git a/client/strings/fr.json b/client/strings/fr.json
index a24dae2b..9e22ed2b 100644
--- a/client/strings/fr.json
+++ b/client/strings/fr.json
@@ -565,7 +565,8 @@
   "PlaceholderNewCollection": "Nom de la nouvelle collection",
   "PlaceholderNewFolderPath": "Nouveau chemin de dossier",
   "PlaceholderNewPlaylist": "Nouveau nom de liste de lecture",
-  "PlaceholderSearch": "Recherche…",
+  "PlaceholderSearch": "Recherche...",
+  "PlaceholderSearchEpisode": "Search episode...",
   "ToastAccountUpdateFailed": "Échec de la mise à jour du compte",
   "ToastAccountUpdateSuccess": "Compte mis à jour",
   "ToastAuthorImageRemoveFailed": "Échec de la suppression de l’image",
diff --git a/client/strings/hr.json b/client/strings/hr.json
index f2eaaf76..395219f4 100644
--- a/client/strings/hr.json
+++ b/client/strings/hr.json
@@ -566,6 +566,7 @@
   "PlaceholderNewFolderPath": "Nova folder putanja",
   "PlaceholderNewPlaylist": "New playlist name",
   "PlaceholderSearch": "Traži...",
+  "PlaceholderSearchEpisode": "Search episode...",
   "ToastAccountUpdateFailed": "Neuspješno aktualiziranje korisničkog računa",
   "ToastAccountUpdateSuccess": "Korisnički račun aktualiziran",
   "ToastAuthorImageRemoveFailed": "Neuspješno uklanjanje slike",
diff --git a/client/strings/it.json b/client/strings/it.json
index e5eb4689..f7d1bda4 100644
--- a/client/strings/it.json
+++ b/client/strings/it.json
@@ -566,6 +566,7 @@
   "PlaceholderNewFolderPath": "Nuovo percorso Cartella",
   "PlaceholderNewPlaylist": "Nome nuova playlist",
   "PlaceholderSearch": "Cerca..",
+  "PlaceholderSearchEpisode": "Search episode..",
   "ToastAccountUpdateFailed": "Aggiornamento Account Fallito",
   "ToastAccountUpdateSuccess": "Account Aggiornato",
   "ToastAuthorImageRemoveFailed": "Rimozione immagine autore Fallita",
diff --git a/client/strings/pl.json b/client/strings/pl.json
index 2641039d..7d8e3573 100644
--- a/client/strings/pl.json
+++ b/client/strings/pl.json
@@ -566,6 +566,7 @@
   "PlaceholderNewFolderPath": "Nowa ścieżka folderu",
   "PlaceholderNewPlaylist": "New playlist name",
   "PlaceholderSearch": "Szukanie..",
+  "PlaceholderSearchEpisode": "Search episode..",
   "ToastAccountUpdateFailed": "Nie udało się zaktualizować konta",
   "ToastAccountUpdateSuccess": "Zaktualizowano konto",
   "ToastAuthorImageRemoveFailed": "Nie udało się usunąć obrazu",
diff --git a/client/strings/ru.json b/client/strings/ru.json
index 25bc1464..b5660db2 100644
--- a/client/strings/ru.json
+++ b/client/strings/ru.json
@@ -566,6 +566,7 @@
   "PlaceholderNewFolderPath": "Путь к новой папке",
   "PlaceholderNewPlaylist": "Новое название плейлиста",
   "PlaceholderSearch": "Поиск...",
+  "PlaceholderSearchEpisode": "Search episode...",
   "ToastAccountUpdateFailed": "Не удалось обновить учетную запись",
   "ToastAccountUpdateSuccess": "Учетная запись обновлена",
   "ToastAuthorImageRemoveFailed": "Не удалось удалить изображение",
diff --git a/client/strings/zh-cn.json b/client/strings/zh-cn.json
index 927cad57..9933d13f 100644
--- a/client/strings/zh-cn.json
+++ b/client/strings/zh-cn.json
@@ -566,6 +566,7 @@
   "PlaceholderNewFolderPath": "输入文件夹路径",
   "PlaceholderNewPlaylist": "输入播放列表名称",
   "PlaceholderSearch": "查找..",
+  "PlaceholderSearchEpisode": "Search episode..",
   "ToastAccountUpdateFailed": "账户更新失败",
   "ToastAccountUpdateSuccess": "帐户已更新",
   "ToastAuthorImageRemoveFailed": "作者图像删除失败",
diff --git a/package-lock.json b/package-lock.json
index eed3ee1f..c184e97d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "audiobookshelf",
-  "version": "2.2.16",
+  "version": "2.2.17",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "audiobookshelf",
-      "version": "2.2.16",
+      "version": "2.2.17",
       "license": "GPL-3.0",
       "dependencies": {
         "axios": "^0.27.2",
diff --git a/package.json b/package.json
index ebc0b8af..1a9cd104 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "2.2.16",
+  "version": "2.2.17",
   "description": "Self-hosted audiobook and podcast server",
   "main": "index.js",
   "scripts": {