diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
index f674cafe..418519e2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
@@ -232,6 +232,11 @@ class ExtensionsFragment : Fragment() {
         val isTv = isTrueTvSettings()
         add_repo_button?.isGone = isTv
         add_repo_button_imageview_holder?.isVisible = isTv
+
+        // Band-aid for Fire TV
+        plugin_storage_appbar?.isFocusableInTouchMode = isTv
+        add_repo_button_imageview?.isFocusableInTouchMode = isTv
+
         add_repo_button?.setOnClickListener(addRepositoryClick)
         add_repo_button_imageview?.setOnClickListener(addRepositoryClick)
 
diff --git a/app/src/main/res/layout/fragment_extensions.xml b/app/src/main/res/layout/fragment_extensions.xml
index 7d262bf3..c786e2bc 100644
--- a/app/src/main/res/layout/fragment_extensions.xml
+++ b/app/src/main/res/layout/fragment_extensions.xml
@@ -56,6 +56,7 @@
     </LinearLayout>
 
     <LinearLayout
+        android:focusable="true"
         android:id="@+id/plugin_storage_appbar"
         android:nextFocusRight="@id/add_repo_button_imageview"
         android:layout_width="match_parent"
@@ -185,6 +186,7 @@
                 android:background="@drawable/outline_drawable"
                 android:nextFocusLeft="@id/plugin_storage_appbar"
                 android:layout_gravity="center"
+                android:focusable="true"
 
                 android:id="@+id/add_repo_button_imageview"
                 android:layout_width="40dp"