diff --git a/device-oriole.mk b/device-oriole.mk
index daa870f..8b04d14 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -271,3 +271,7 @@ else
         PRODUCT_COPY_FILES += \
 		device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif
+
+# 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 77e6b08..550a8b3 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -290,3 +290,7 @@ else
         PRODUCT_COPY_FILES += \
 		device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif
+
+# Disable Settings large-screen optimization enabled by Window Extensions
+PRODUCT_SYSTEM_PROPERTIES += \
+    persist.settings.large_screen_opt.enabled=false