diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/ThemeManager.java b/app/src/main/java/com/github/yeriomin/yalpstore/ThemeManager.java
index 70678b95f..20bf53b8b 100644
--- a/app/src/main/java/com/github/yeriomin/yalpstore/ThemeManager.java
+++ b/app/src/main/java/com/github/yeriomin/yalpstore/ThemeManager.java
@@ -13,6 +13,9 @@ public class ThemeManager {
         switch (theme) {
             default:
             case PreferenceActivity.THEME_NONE:
+                if (isAmazonTv(activity)) {
+                    activity.setTheme(getThemeDark());
+                }
                 break;
             case PreferenceActivity.THEME_LIGHT:
                 activity.setTheme(getThemeLight());
@@ -46,4 +49,8 @@ public class ThemeManager {
             return android.R.style.Theme;
         }
     }
+
+    static private boolean isAmazonTv(Activity activity) {
+        return ((YalpStoreApplication) activity.getApplication()).isTv() && Build.MANUFACTURER.toLowerCase().contains("amazon");
+    }
 }