diff --git a/packages/desktop/src/components/prompt-input.tsx b/packages/desktop/src/components/prompt-input.tsx
index a04211a98..b152ff0f5 100644
--- a/packages/desktop/src/components/prompt-input.tsx
+++ b/packages/desktop/src/components/prompt-input.tsx
@@ -850,6 +850,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
         </Show>
         <div class="relative max-h-[240px] overflow-y-auto">
           <div
+            data-component="prompt-input"
             ref={(el) => {
               editorRef = el
               props.ref?.(el)
diff --git a/packages/ui/src/components/session-turn.tsx b/packages/ui/src/components/session-turn.tsx
index 14e4055ca..cab6a7af3 100644
--- a/packages/ui/src/components/session-turn.tsx
+++ b/packages/ui/src/components/session-turn.tsx
@@ -108,8 +108,7 @@ export function SessionTurn(
 
   createResizeObserver(
     () => state.contentRef,
-    ({ height }) => {
-      console.log(height)
+    () => {
       scrollToBottom()
     },
   )
diff --git a/packages/ui/src/context/dialog.tsx b/packages/ui/src/context/dialog.tsx
index 71fc63806..56be9ee47 100644
--- a/packages/ui/src/context/dialog.tsx
+++ b/packages/ui/src/context/dialog.tsx
@@ -33,6 +33,10 @@ function init() {
     },
     close() {
       active()?.onClose?.()
+      if (!active()?.onClose) {
+        const promptInput = document.querySelector("[data-component=prompt-input]") as HTMLElement
+        promptInput?.focus()
+      }
       setActive(undefined)
     },
     show(element: DialogElement, owner: Owner, onClose?: () => void) {
@@ -48,7 +52,6 @@ function init() {
                 open={true}
                 onOpenChange={(open) => {
                   if (!open) {
-                    console.log("closing")
                     result.close()
                   }
                 }}