diff --git a/aosp_rpi5.mk b/aosp_rpi5.mk
index bca5c6c..2956b95 100644
--- a/aosp_rpi5.mk
+++ b/aosp_rpi5.mk
@@ -16,6 +16,10 @@ PRODUCT_CHARACTERISTICS := tablet,nosdcard
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 $(call enforce-product-packages-exist,com.android.ranging)
 
+# Freeform windows
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.software.freeform_window_management.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.freeform_window_management.xml
+
 # Keylayout
 PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)/keylayout/Generic.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Generic.kl
diff --git a/overlay/AndroidRpiOverlay/res/values/config.xml b/overlay/AndroidRpiOverlay/res/values/config.xml
index e17fa96..6be5e23 100644
--- a/overlay/AndroidRpiOverlay/res/values/config.xml
+++ b/overlay/AndroidRpiOverlay/res/values/config.xml
@@ -121,4 +121,10 @@
     <bool name="config_cecTvSendStandbyOnSleepEnabled_default">false</bool>
     <bool name="config_cecTvSendStandbyOnSleepDisabled_default">true</bool>
 
+    <!-- Whether desktop mode is supported on the current device  -->
+    <bool name="config_isDesktopModeSupported">true</bool>
+
+    <!-- Whether the developer option for desktop mode is supported on the current device  -->
+    <bool name="config_isDesktopModeDevOptionSupported">true</bool>
+
 </resources>