diff --git a/device-cheetah.mk b/device-cheetah.mk
index 0fbb3b1..7fba79f 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -362,3 +362,6 @@ PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.exampl
 # Setup Wizard device-specific settings
 PRODUCT_PRODUCT_PROPERTIES += \
     setupwizard.feature.enable_quick_start_flow_for_debug=true \
+
+# Window Extensions
+$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
diff --git a/device-panther.mk b/device-panther.mk
index b9561be..c065c17 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -345,3 +345,6 @@ PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.exampl
 # Setup Wizard device-specific settings
 PRODUCT_PRODUCT_PROPERTIES += \
     setupwizard.feature.enable_quick_start_flow_for_debug=true \
+
+# Window Extensions
+$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)