diff --git a/device-oriole.mk b/device-oriole.mk
index 8c19639..f01655c 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -274,3 +274,8 @@ 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.settings.large_screen_opt.enabled=false
+
diff --git a/device-raven.mk b/device-raven.mk
index a3067f7..a926be3 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -293,3 +293,8 @@ 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.settings.large_screen_opt.enabled=false
+