diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
index 0bd90390..62abf92f 100644
--- a/common/src/main/AndroidManifest.xml
+++ b/common/src/main/AndroidManifest.xml
@@ -5,6 +5,10 @@
 
     <application>
 
+        <meta-data
+            android:name="android.allow_multiple_resumed_activities"
+            android:value="true" />
+
         <activity
             android:name="com.shilapi.xcertplay.CarPlayHostActivity"
             android:configChanges="density|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
@@ -12,6 +16,7 @@
             android:launchMode="singleTask"
             android:resizeableActivity="true"
             android:screenOrientation="fullSensor"
+            android:supportsPictureInPicture="true"
             android:theme="@style/Theme.Xcertplay"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
@@ -30,11 +35,13 @@
         <activity
             android:name="com.shilapi.xcertplay.MainActivity"
             android:exported="true"
+            android:resizeableActivity="true"
             android:theme="@style/Theme.Xcertplay" />
 
         <activity
             android:name="com.shilapi.xcertplay.ImageCropActivity"
             android:exported="false"
+            android:resizeableActivity="true"
             android:screenOrientation="fullSensor"
             android:theme="@style/Theme.Xcertplay" />
 
diff --git a/common/src/main/java/com/shilapi/xcertplay/CarPlayHostActivity.kt b/common/src/main/java/com/shilapi/xcertplay/CarPlayHostActivity.kt
index af9db22c..e7fc5426 100644
--- a/common/src/main/java/com/shilapi/xcertplay/CarPlayHostActivity.kt
+++ b/common/src/main/java/com/shilapi/xcertplay/CarPlayHostActivity.kt
@@ -641,6 +641,15 @@ class CarPlayHostActivity : ComponentActivity() {
         }
     }
 
+    override fun onMultiWindowModeChanged(isInMultiWindowMode: Boolean, newConfig: Configuration) {
+        super.onMultiWindowModeChanged(isInMultiWindowMode, newConfig)
+        applyFullscreenMode()
+        videoView?.post {
+            val view = videoView ?: return@post
+            scheduleDisplaySize(view.width, view.height)
+        }
+    }
+
     override fun onDestroy() {
         stopMicrophoneGainTest()
         mainHandler.removeCallbacks(applyDisplaySize)
@@ -3097,6 +3106,9 @@ class CarPlayHostActivity : ComponentActivity() {
             append(if (hideTopBar) "top hidden" else "top shown")
             append(", ")
             append(if (hideBottomBar) "bottom hidden" else "bottom shown")
+            if (isInMultiWindowMode) {
+                append(" (multi-window)")
+            }
         }
         resolutionPreviewView?.text = buildString {
             append(resolution).append('\n')
@@ -4035,8 +4047,9 @@ class CarPlayHostActivity : ComponentActivity() {
     }
 
     private fun applyFullscreenMode() {
-        val hideTop = hideTopBar
-        val hideBottom = hideBottomBar
+        val inMultiWindow = isInMultiWindowMode
+        val hideTop = hideTopBar && !inMultiWindow
+        val hideBottom = hideBottomBar && !inMultiWindow
         WindowCompat.setDecorFitsSystemWindows(window, !(hideTop && hideBottom))
         val controller = WindowInsetsControllerCompat(window, window.decorView)
         if (hideTop) {