diff --git a/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/StreamViewerScreen.kt b/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/StreamViewerScreen.kt
index c090b547..14f70d10 100644
--- a/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/StreamViewerScreen.kt
+++ b/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/StreamViewerScreen.kt
@@ -96,7 +96,13 @@ internal fun StreamViewerScreen(group: Long, source: Long, epoch: Long, title: S
             LogManager.addLog("INFO", "stream", "viewer orientation source=$source aspect=$aspect requested=$orientation")
         }
     }
-    LaunchedEffect(status) { controls = true }
+    LaunchedEffect(status) {
+        controls = true
+        if (status == R.string.stream_ended) {
+            LogManager.addLog("INFO", "stream", "viewer ended; closing window group=$group source=$source epoch=$epoch")
+            onClose()
+        }
+    }
     LaunchedEffect(controls, status, visible, hideTick) {
         if (controls && status == R.string.stream_live && visible) { delay(3000); controls = false }
     }