diff --git a/src/renderer/components/Modal/Modal.tsx b/src/renderer/components/Modal/Modal.tsx
index 36b182cd..a901c465 100644
--- a/src/renderer/components/Modal/Modal.tsx
+++ b/src/renderer/components/Modal/Modal.tsx
@@ -92,7 +92,7 @@ export const Modal: React.FC<ModalProps> & {
       data-testid={testId}
     >
       <div
-        className="bg-copilot-surface border border-copilot-border rounded-lg shadow-xl max-w-[90%]"
+        className="bg-copilot-surface border border-copilot-border rounded-lg shadow-xl max-w-[90%] max-h-[90vh] flex flex-col my-4"
         style={{ width, WebkitAppRegion: 'no-drag' } as React.CSSProperties}
         role="dialog"
         aria-modal="true"
diff --git a/src/renderer/components/SettingsModal/SettingsModal.tsx b/src/renderer/components/SettingsModal/SettingsModal.tsx
index be51bd10..bb7e5ebd 100644
--- a/src/renderer/components/SettingsModal/SettingsModal.tsx
+++ b/src/renderer/components/SettingsModal/SettingsModal.tsx
@@ -684,9 +684,9 @@ export const SettingsModal: React.FC<SettingsModalProps> = ({
 
   return (
     <Modal isOpen={isOpen} onClose={onClose} title="Settings" width="600px" testId="settings-modal">
-      <div className="flex min-h-[400px]">
+      <div className="flex min-h-[400px] flex-1 min-h-0">
         {/* Sidebar */}
-        <div className="w-40 border-r border-copilot-border p-2 shrink-0">
+        <div className="w-40 border-r border-copilot-border p-2 shrink-0 overflow-y-auto">
           {sections.map((section) => (
             <button
               key={section.id}
@@ -704,7 +704,7 @@ export const SettingsModal: React.FC<SettingsModalProps> = ({
         </div>
 
         {/* Content */}
-        <div className="flex-1 p-4">{renderContent()}</div>
+        <div className="flex-1 p-4 overflow-y-auto min-h-0">{renderContent()}</div>
       </div>
     </Modal>
   );