diff --git a/device-cheetah.mk b/device-cheetah.mk
index cca2ad1..60e7428 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -384,3 +384,7 @@ PRODUCT_COPY_FILES += \
 
 # Window Extensions
 $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
+
+# Disable Settings large-screen optimization enabled by Window Extensions
+PRODUCT_SYSTEM_PROPERTIES += \
+    persist.settings.large_screen_opt.enabled=false
diff --git a/device-panther.mk b/device-panther.mk
index f8192de..7f30d76 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -368,3 +368,7 @@ PRODUCT_COPY_FILES += \
 
 # Window Extensions
 $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
+
+# Disable Settings large-screen optimization enabled by Window Extensions
+PRODUCT_SYSTEM_PROPERTIES += \
+    persist.settings.large_screen_opt.enabled=false