diff --git a/Jellyfin.Plugin.MediaBarEnhanced/Jellyfin.Plugin.MediaBarEnhanced.csproj b/Jellyfin.Plugin.MediaBarEnhanced/Jellyfin.Plugin.MediaBarEnhanced.csproj
index 2443f0f..af9e91c 100644
--- a/Jellyfin.Plugin.MediaBarEnhanced/Jellyfin.Plugin.MediaBarEnhanced.csproj
+++ b/Jellyfin.Plugin.MediaBarEnhanced/Jellyfin.Plugin.MediaBarEnhanced.csproj
@@ -12,7 +12,7 @@
     <!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> -->
     <Title>Jellyfin Media Bar Enhanced Plugin</Title>
     <Authors>CodeDevMLH</Authors>
-    <Version>1.5.0.20</Version>
+    <Version>1.5.0.21</Version>
     <RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced</RepositoryUrl>
   </PropertyGroup>
 
diff --git a/Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js b/Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js
index 1323041..bd44d82 100644
--- a/Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js
+++ b/Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js
@@ -2661,33 +2661,42 @@ const SlideshowManager = {
       const activeElement = document.activeElement;
       const isSlideshowFocused = container.contains(activeElement) || activeElement === container;
       
-      if (!isSlideshowFocused) {
+      const isTvMode = window.layoutManager && window.layoutManager.tv;
+      
+      const isInputElement = activeElement && (activeElement.tagName === 'INPUT' || activeElement.tagName === 'TEXTAREA' || activeElement.isContentEditable);
+      
+      if (isInputElement) {
         return;
       }
 
       switch (e.key) {
         case "ArrowRight":
+          if (isTvMode && !isSlideshowFocused) return;
           SlideshowManager.nextSlide();
           e.preventDefault();
           break;
 
         case "ArrowLeft":
+          if (isTvMode && !isSlideshowFocused) return;
           SlideshowManager.prevSlide();
           e.preventDefault();
           break;
 
         case " ": // Space bar
+          if (isTvMode && !isSlideshowFocused) return;
           this.togglePause();
           e.preventDefault();
           break;
 
         case "m": // Mute toggle
         case "M":
+          if (isTvMode && !isSlideshowFocused) return;
           this.toggleMute();
           e.preventDefault();
           break;
 
         case "Enter":
+          if (!isSlideshowFocused) return;
           const currentItemId = STATE.slideshow.itemIds[STATE.slideshow.currentSlideIndex];
           if (currentItemId) {
              if (window.Emby && window.Emby.Page) {
diff --git a/manifest.json b/manifest.json
index 2eb86f7..1ef800c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,7 +9,7 @@
     "imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png",
     "versions": [
       {
-        "version": "1.5.0.20",
+        "version": "1.5.0.21",
         "changelog": "- fix: Keyboard controls in TV mode\n- Add sorting options for content\n- Update mediaBarEnhanced.js and mediaBarEnhanced.css with version 4.0.1 from original repo",
         "targetAbi": "10.11.0.0",
         "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.5.0.20/Jellyfin.Plugin.MediaBarEnhanced.zip",