diff --git a/device-cheetah.mk b/device-cheetah.mk
index cca2ad1..2853291 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -384,3 +384,6 @@ 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.sys.fflag.override.settings_support_large_screen=false
diff --git a/device-panther.mk b/device-panther.mk
index f8192de..3a6e4b1 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -368,3 +368,6 @@ 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.sys.fflag.override.settings_support_large_screen=false