diff --git a/packages/desktop/src/providers/ConversationProvider.tsx b/packages/desktop/src/providers/ConversationProvider.tsx
index 3c19338..f6bf4ec 100644
--- a/packages/desktop/src/providers/ConversationProvider.tsx
+++ b/packages/desktop/src/providers/ConversationProvider.tsx
@@ -21,7 +21,7 @@ interface IConversationContext {
   selectedConversation?: MasterConversation;
   selectConversation?: (conversationId: string, temporaryOverrideSort?: boolean) => Promise<void>;
 
-  handleStartConversation?: (otherUsers: User[], conversationName?: string) => Promise<void>;
+  handleStartConversation?: (otherUsers: User[], conversationName?: string) => Promise<boolean>;
 }
 
 const ConversationContext = React.createContext<IConversationContext>({
@@ -139,10 +139,13 @@ export function ConversationProvider({ children }: { children: React.ReactNode }
         selectConversation(createdConversationResult.data.conversationId.toString(), true);
 
         toast.success('started conversation');
+
+        return true;
       } catch (error) {
         console.error(error);
         toast.error(error.message);
       }
+      return false;
     },
     [selectConversation],
   );
diff --git a/packages/desktop/src/tree/NewConversationDialog.tsx b/packages/desktop/src/tree/NewConversationDialog.tsx
index e01fc36..80becad 100644
--- a/packages/desktop/src/tree/NewConversationDialog.tsx
+++ b/packages/desktop/src/tree/NewConversationDialog.tsx
@@ -97,11 +97,13 @@ export default function NewConversationDialog() {
 
     setIsSubmitting(true);
 
-    await handleStartConversation(selectedUsers, conversationName);
+    const succeeded = await handleStartConversation(selectedUsers, conversationName);
 
     // clear form for next time
-    setSelectedUsers([]);
-    setConversationName('');
+    if (succeeded) {
+      setSelectedUsers([]);
+      setConversationName('');
+    }
 
     setIsSubmitting(false);
   }, [
diff --git a/packages/desktop/src/tree/Terminal.tsx b/packages/desktop/src/tree/Terminal.tsx
index ff16830..666756d 100644
--- a/packages/desktop/src/tree/Terminal.tsx
+++ b/packages/desktop/src/tree/Terminal.tsx
@@ -35,7 +35,9 @@ export default function Terminal() {
         >
           <Navbar />
 
-          <ConversationList />
+          <Box sx={{ p: 2 }}>
+            <ConversationList />
+          </Box>
         </Grid>
 
         <Grid item xs={8} sx={{ bgcolor: 'white' }}>