diff --git a/src/lib/components/layout/Sidebar.svelte b/src/lib/components/layout/Sidebar.svelte
index 6136b19e4e..7fc6991311 100644
--- a/src/lib/components/layout/Sidebar.svelte
+++ b/src/lib/components/layout/Sidebar.svelte
@@ -87,13 +87,13 @@
 
 <div
 	bind:this={navElement}
-	class="h-screen {show
+	class="h-screen max-h-[100dvh] {show
 		? ''
 		: '-translate-x-[260px] w-[0px]'}  w-[260px] min-w[260px] bg-black text-gray-200 shadow-2xl text-sm transition z-40 fixed top-0 left-0 lg:relative
         "
 >
 	<div
-		class="py-2.5 my-auto flex flex-col justify-between h-screen w-[260px] {show
+		class="py-2.5 my-auto flex flex-col justify-between h-screen max-h-[100dvh] w-[260px] {show
 			? ''
 			: 'invisible'}"
 	>
diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte
index 1dd6319bca..0840300b88 100644
--- a/src/routes/(app)/+page.svelte
+++ b/src/routes/(app)/+page.svelte
@@ -787,7 +787,7 @@
 	};
 </script>
 
-<div class="min-h-screen max-h-screen w-full flex flex-col">
+<div class="h-screen max-h-[100dvh] w-full flex flex-col">
 	<Navbar {title} shareEnabled={messages.length > 0} {initNewChat} {tags} {addTag} {deleteTag} />
 	<div class="flex flex-col flex-auto">
 		<div