diff --git a/device-oriole.mk b/device-oriole.mk
index ce385db..3d4121f 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -279,3 +279,6 @@ endif
 
 # 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-raven.mk b/device-raven.mk
index 9eaea5f..a459635 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -300,3 +300,6 @@ endif
 
 # 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