diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/DisplayExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/DisplayExtensions.kt
index f051ccbc86..f493726ca3 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/system/DisplayExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/DisplayExtensions.kt
@@ -26,6 +26,7 @@ fun Context.prepareTabletUiContext(): Context {
     val configuration = resources.configuration
     val expected = when (Injekt.get<UiPreferences>().tabletUiMode().get()) {
         TabletUiMode.AUTOMATIC ->
+            isTvBox(this) ||
             configuration.smallestScreenWidthDp >= when (configuration.orientation) {
                 Configuration.ORIENTATION_PORTRAIT -> TABLET_UI_MIN_SCREEN_WIDTH_PORTRAIT_DP
                 else -> TABLET_UI_MIN_SCREEN_WIDTH_LANDSCAPE_DP
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/TvUtils.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/TvUtils.kt
index 9a49bbaa96..630b2b7204 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/system/TvUtils.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/TvUtils.kt
@@ -12,6 +12,7 @@ fun isTvBox(context: Context): Boolean {
 
     // TV for sure
     if (
+        pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK) ||
         context.getSystemService(UiModeManager::class.java)
             .getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION
     ) {