diff --git a/app/src/main/java/org/schabi/newpipe/util/FireTvUtils.java b/app/src/main/java/org/schabi/newpipe/util/FireTvUtils.java
index 69666463e..879b54e1f 100644
--- a/app/src/main/java/org/schabi/newpipe/util/FireTvUtils.java
+++ b/app/src/main/java/org/schabi/newpipe/util/FireTvUtils.java
@@ -1,10 +1,18 @@
 package org.schabi.newpipe.util;
 
+import android.annotation.SuppressLint;
+import android.content.pm.PackageManager;
+
 import org.schabi.newpipe.App;
 
 public class FireTvUtils {
+    @SuppressLint("InlinedApi")
     public static boolean isFireTv(){
         final String AMAZON_FEATURE_FIRE_TV = "amazon.hardware.fire_tv";
-        return App.getApp().getPackageManager().hasSystemFeature(AMAZON_FEATURE_FIRE_TV);
+
+        PackageManager pm =  App.getApp().getPackageManager();
+
+        return pm.hasSystemFeature(AMAZON_FEATURE_FIRE_TV)
+                || pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK);
     }
 }