diff --git a/ui/src/components/NavigationBar.tsx b/ui/src/components/NavigationBar.tsx
index 211e24e..522b812 100644
--- a/ui/src/components/NavigationBar.tsx
+++ b/ui/src/components/NavigationBar.tsx
@@ -163,7 +163,7 @@ export const SideNavigation = ({
     <div
       className={twMerge(
         "group isolate flex flex-col overflow-y-auto overflow-x-hidden bg-navbar-background transition-all duration-300",
-        "fixed md:relative h-screen z-50",
+        "fixed md:relative h-[calc(100vh-2rem)] md:h-screen z-50",
         isCollapsed ? "w-16" : "w-48",
         "md:flex",
         "transform md:transform-none",
@@ -220,7 +220,7 @@ export const SideNavigation = ({
       <MainNavigation isCollapsed={isCollapsed} />
       <div
         className={twMerge(
-          "bg-navbar-background flex px-1 pb-1.5 w-full",
+          "bg-navbar-background flex px-1 pb-1.5 w-full mt-auto",
           isCollapsed ? "pl-2.5 pr-3.5" : ""
         )}
       >