diff --git a/packages/bruno-app/src/components/AIAssist/StyledWrapper.js b/packages/bruno-app/src/components/AIAssist/StyledWrapper.js
index 438de2006..0205efb7b 100644
--- a/packages/bruno-app/src/components/AIAssist/StyledWrapper.js
+++ b/packages/bruno-app/src/components/AIAssist/StyledWrapper.js
@@ -105,6 +105,7 @@ export const PopupWrapper = styled.div`
     background: ${(props) => props.theme.input.bg};
     color: ${(props) => props.theme.text};
     resize: vertical;
+    min-height: calc(3 * 1.4em + 18px);
     outline: none;
     transition: border-color 0.15s ease;
 
diff --git a/packages/bruno-app/src/components/Preferences/AI/StyledWrapper.js b/packages/bruno-app/src/components/Preferences/AI/StyledWrapper.js
index adba3b50b..9ec05123e 100644
--- a/packages/bruno-app/src/components/Preferences/AI/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Preferences/AI/StyledWrapper.js
@@ -41,6 +41,8 @@ const StyledWrapper = styled.div`
     display: flex;
     flex-direction: column;
     min-height: 0;
+    overflow-y: auto;
+    padding-bottom: 2rem;
   }
 
   .ai-master {