diff --git a/ui/desktop/.gitignore b/ui/desktop/.gitignore
index 46be848bc68a..c3482b5af576 100644
--- a/ui/desktop/.gitignore
+++ b/ui/desktop/.gitignore
@@ -8,3 +8,4 @@ src/bin/goose-npm/
 /playwright-report/
 /test-results/
 /src/bin/temporal-service
+src/bin/temporal.db
diff --git a/ui/desktop/src/App.tsx b/ui/desktop/src/App.tsx
index d312764b9c1f..6de7f9171d0a 100644
--- a/ui/desktop/src/App.tsx
+++ b/ui/desktop/src/App.tsx
@@ -105,7 +105,6 @@ const getInitialView = (): ViewConfig => {
 export default function App() {
   const [fatalError, setFatalError] = useState<string | null>(null);
   const [modalVisible, setModalVisible] = useState(false);
-  const [appInitialized, setAppInitialized] = useState(false);
   const [pendingLink, setPendingLink] = useState<string | null>(null);
   const [modalMessage, setModalMessage] = useState<string>('');
   const [extensionConfirmLabel, setExtensionConfirmLabel] = useState<string>('');
@@ -207,15 +206,10 @@ export default function App() {
       toastService.configure({ silent: false });
     };
 
-    (async () => {
-      try {
-        await initializeApp();
-        setAppInitialized(true);
-      } catch (error) {
-        console.error('Unhandled error in initialization:', error);
-        setFatalError(`${error instanceof Error ? error.message : 'Unknown error'}`);
-      }
-    })();
+    initializeApp().catch((error) => {
+      console.error('Unhandled error in initialization:', error);
+      setFatalError(`${error instanceof Error ? error.message : 'Unknown error'}`);
+    });
   }, [read, getExtensions, addExtension]);
 
   const [isGoosehintsModalOpen, setIsGoosehintsModalOpen] = useState(false);
@@ -507,7 +501,6 @@ export default function App() {
           )}
           {view === 'chat' && !isLoadingSession && (
             <ChatView
-              readyForAutoUserPrompt={appInitialized}
               chat={chat}
               setChat={setChat}
               setView={setView}
diff --git a/ui/desktop/src/components/ChatView.tsx b/ui/desktop/src/components/ChatView.tsx
index 82649d152b05..052f132e4c78 100644
--- a/ui/desktop/src/components/ChatView.tsx
+++ b/ui/desktop/src/components/ChatView.tsx
@@ -56,13 +56,11 @@ const isUserMessage = (message: Message): boolean => {
 };
 
 export default function ChatView({
-  readyForAutoUserPrompt,
   chat,
   setChat,
   setView,
   setIsGoosehintsModalOpen,
 }: {
-  readyForAutoUserPrompt: boolean;
   chat: ChatType;
   setChat: (chat: ChatType) => void;
   setView: (view: View, viewOptions?: ViewOptions) => void;
@@ -71,7 +69,6 @@ export default function ChatView({
   return (
     <ChatContextManagerProvider>
       <ChatContent
-        readyForAutoUserPrompt={readyForAutoUserPrompt}
         chat={chat}
         setChat={setChat}
         setView={setView}
@@ -87,7 +84,6 @@ function ChatContent({
   setView,
   setIsGoosehintsModalOpen,
 }: {
-  readyForAutoUserPrompt: boolean;
   chat: ChatType;
   setChat: (chat: ChatType) => void;
   setView: (view: View, viewOptions?: ViewOptions) => void;
@@ -627,7 +623,7 @@ function ChatContent({
             isLoading={isLoading}
             onStop={onStopGoose}
             commandHistory={commandHistory}
-            initialValue={_input || initialPrompt}
+            initialValue={_input || (hasMessages ? _input : initialPrompt)}
             setView={setView}
             hasMessages={hasMessages}
             numTokens={sessionTokenCount}