diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index b4c324b928..a9b0aa3018 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -76,9 +76,11 @@
 
         <activity
             android:name=".SessionPopupActivity"
+            android:documentLaunchMode="always"
             android:exported="false"
             android:excludeFromRecents="true"
-            android:launchMode="singleTop"
+            android:launchMode="standard"
+            android:taskAffinity="com.openai.codex.agent.popup"
             android:theme="@style/CodexSessionPopupTheme" />
 
         <receiver
diff --git a/android/app/src/main/java/com/openai/codex/agent/SessionPopupActivity.kt b/android/app/src/main/java/com/openai/codex/agent/SessionPopupActivity.kt
index bcb47062a5..c4182ed799 100644
--- a/android/app/src/main/java/com/openai/codex/agent/SessionPopupActivity.kt
+++ b/android/app/src/main/java/com/openai/codex/agent/SessionPopupActivity.kt
@@ -243,10 +243,25 @@ class SessionPopupActivity : Activity() {
         button: Button,
     ) {
         AgentQuestionNotifier.cancel(this, session.sessionId)
-        if (!isTopLevelHomeSession(session)) {
-            finish()
+        if (isTopLevelHomeSession(session)) {
+            consumeHomeResultPresentation(session, button)
             return
         }
+        if (isTopLevelAgentSession(session)) {
+            cancelAgentSessionTree(session.sessionId, button)
+            return
+        }
+        if (session.parentSessionId != null) {
+            cancelAgentSession(session.sessionId, button)
+            return
+        }
+        finish()
+    }
+
+    private fun consumeHomeResultPresentation(
+        session: AgentSessionDetails,
+        button: Button,
+    ) {
         button.isEnabled = false
         thread(name = "CodexSessionPopupConsume-${session.sessionId}") {
             runCatching {
@@ -271,6 +286,61 @@ class SessionPopupActivity : Activity() {
         }
     }
 
+    private fun cancelAgentSessionTree(
+        sessionId: String,
+        button: Button,
+    ) {
+        button.isEnabled = false
+        thread(name = "CodexSessionPopupCancelTree-$sessionId") {
+            runCatching {
+                sessionController.cancelSessionTree(sessionId)
+            }.onFailure { err ->
+                runOnUiThread {
+                    button.isEnabled = true
+                    Toast.makeText(
+                        this,
+                        "Failed to clear session state: ${err.message}",
+                        Toast.LENGTH_SHORT,
+                    ).show()
+                }
+            }.onSuccess {
+                runOnUiThread {
+                    finish()
+                }
+            }
+        }
+    }
+
+    private fun cancelAgentSession(
+        sessionId: String,
+        button: Button,
+    ) {
+        button.isEnabled = false
+        thread(name = "CodexSessionPopupCancel-$sessionId") {
+            runCatching {
+                sessionController.cancelSession(sessionId)
+            }.onFailure { err ->
+                runOnUiThread {
+                    button.isEnabled = true
+                    Toast.makeText(
+                        this,
+                        "Failed to clear session state: ${err.message}",
+                        Toast.LENGTH_SHORT,
+                    ).show()
+                }
+            }.onSuccess {
+                runOnUiThread {
+                    finish()
+                }
+            }
+        }
+    }
+
+    private fun isTopLevelAgentSession(session: AgentSessionDetails): Boolean {
+        return session.anchor == AgentSessionInfo.ANCHOR_AGENT &&
+            session.parentSessionId == null
+    }
+
     private fun isTopLevelHomeSession(session: AgentSessionDetails): Boolean {
         return session.anchor == AgentSessionInfo.ANCHOR_HOME &&
             session.parentSessionId == null
diff --git a/android/app/src/main/res/layout/activity_session_result_popup.xml b/android/app/src/main/res/layout/activity_session_result_popup.xml
index 0a7653aaf9..043951ea54 100644
--- a/android/app/src/main/res/layout/activity_session_result_popup.xml
+++ b/android/app/src/main/res/layout/activity_session_result_popup.xml
@@ -14,9 +14,8 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="320dp"
         android:layout_marginTop="12dp"
-        android:maxHeight="340dp"
         android:fadeScrollbars="false"
         android:overScrollMode="ifContentScrolls"
         android:scrollbars="vertical">