diff --git a/packages/desktop/src/components/ConversationDetails.tsx b/packages/desktop/src/components/ConversationDetails.tsx
index d49e33d..1fb686b 100644
--- a/packages/desktop/src/components/ConversationDetails.tsx
+++ b/packages/desktop/src/components/ConversationDetails.tsx
@@ -127,7 +127,7 @@ export default function ConversationDetails() {
         </Box>
       </Stack>
 
-      <Container maxWidth={false} sx={{ position: 'relative', flex: 1 }}>
+      <Container maxWidth={false} sx={{ position: 'relative', flex: 1, overflow: 'auto' }}>
         <ConversationHistory />
 
         <Box
diff --git a/packages/desktop/src/components/MainPanel.tsx b/packages/desktop/src/components/MainPanel.tsx
index a8e5ae9..1d71d4e 100644
--- a/packages/desktop/src/components/MainPanel.tsx
+++ b/packages/desktop/src/components/MainPanel.tsx
@@ -16,7 +16,16 @@ export default function MainPanel() {
   // show who is
 
   return (
-    <Grid item xs={8} sx={{ backgroundColor: 'white', display: 'flex', flexDirection: 'column' }}>
+    <Grid
+      item
+      xs={8}
+      sx={{
+        backgroundColor: 'white',
+        display: 'flex',
+        flexDirection: 'column',
+        maxHeight: '100vh',
+      }}
+    >
       {selectedConversation ? (
         <ConversationDetails />
       ) : (
diff --git a/packages/desktop/src/components/Terminal.tsx b/packages/desktop/src/components/Terminal.tsx
index b6069b7..d14c4af 100644
--- a/packages/desktop/src/components/Terminal.tsx
+++ b/packages/desktop/src/components/Terminal.tsx
@@ -503,6 +503,7 @@ export function TerminalProvider({ children }: { children?: React.ReactNode }) {
       }}
     >
       <Grid container spacing={0}>
+        {/* side panel */}
         <Grid
           item
           xs={4}