diff --git a/src/lib/components/chat/Settings/ArchivedChats.svelte b/src/lib/components/chat/Settings/ArchivedChats.svelte
index 7a1fb92b5c..e66b787bed 100644
--- a/src/lib/components/chat/Settings/ArchivedChats.svelte
+++ b/src/lib/components/chat/Settings/ArchivedChats.svelte
@@ -190,7 +190,7 @@
 	}}
 />
 
-<div id="tab-archived-chats" class="flex flex-col h-full text-sm">
+<div id="tab-archived-chats" class="flex flex-col h-full overflow-y-auto text-sm">
 	<div class="mb-3 flex items-center justify-between">
 		<h2 class="text-sm font-medium text-gray-900 dark:text-white">
 			{$i18n.t('settings.personal.archivedChats.title')}
@@ -292,7 +292,7 @@
 		{/if}
 	</div>
 
-	<div class="mt-3 flex-1 min-h-0 overflow-y-auto scrollbar-hover pr-1.5">
+	<div class="mt-3 flex-1 min-h-24 overflow-y-auto scrollbar-hover pr-1.5">
 		{#if chatList === null}
 			<div class="flex min-h-20 items-center justify-center">
 				<Spinner className="size-5" />
diff --git a/src/lib/components/chat/Settings/Shortcuts.svelte b/src/lib/components/chat/Settings/Shortcuts.svelte
index bf4d1ade51..7e57240f0e 100644
--- a/src/lib/components/chat/Settings/Shortcuts.svelte
+++ b/src/lib/components/chat/Settings/Shortcuts.svelte
@@ -105,7 +105,7 @@
 
 <svelte:window on:keydown|capture={handleRecordingKeydown} />
 
-<div id="tab-shortcuts" class="flex h-full flex-col text-sm">
+<div id="tab-shortcuts" class="flex h-full flex-col overflow-y-auto text-sm">
 	<div class="mb-4 flex items-center justify-between">
 		<h2 class="text-sm font-medium text-gray-900 dark:text-white">
 			{$i18n.t('settings.personal.shortcuts.title')}
@@ -141,7 +141,7 @@
 		</p>
 	</div>
 
-	<div class="flex-1 min-h-0 overflow-y-auto scrollbar-hover pr-1.5">
+	<div class="flex-1 min-h-24 overflow-y-auto scrollbar-hover pr-1.5">
 		<div class="flex items-center gap-2 px-1 pb-1">
 			<span class="flex-1 text-[0.625rem] text-gray-400 dark:text-gray-600">
 				{$i18n.t('settings.personal.shortcuts.command.label')}