diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index f0c5efd2b6..60e55f9afb 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -36,7 +36,8 @@
 
         <activity
             android:name=".MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/android/app/src/main/java/com/openai/codexd/MainActivity.kt b/android/app/src/main/java/com/openai/codexd/MainActivity.kt
index ad1f7f6ee6..1591a03f91 100644
--- a/android/app/src/main/java/com/openai/codexd/MainActivity.kt
+++ b/android/app/src/main/java/com/openai/codexd/MainActivity.kt
@@ -102,6 +102,7 @@ class MainActivity : Activity() {
 
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
+        Log.i(TAG, "onNewIntent action=${intent.action}")
         setIntent(intent)
         handleSessionIntent(intent)
         refreshAgentSessions()
@@ -109,6 +110,7 @@ class MainActivity : Activity() {
 
     override fun onResume() {
         super.onResume()
+        handleSessionIntent(intent)
         registerSessionListenerIfNeeded()
         registerAuthStatusReceiverIfNeeded()
         AgentCodexAppServerClient.registerRuntimeStatusListener(runtimeStatusListener)
@@ -168,6 +170,7 @@ class MainActivity : Activity() {
         val prompt = intent.getStringExtra(EXTRA_DEBUG_PROMPT)?.trim().orEmpty()
         if (prompt.isEmpty()) {
             Log.w(TAG, "Ignoring debug start intent without prompt")
+            intent.action = null
             return
         }
         val targetPackageOverride = intent.getStringExtra(EXTRA_DEBUG_TARGET_PACKAGE)?.trim()