diff --git a/frontend/src/components/AppShell.tsx b/frontend/src/components/AppShell.tsx
index 98bd70a9..821b3b89 100644
--- a/frontend/src/components/AppShell.tsx
+++ b/frontend/src/components/AppShell.tsx
@@ -341,7 +341,7 @@ function LeftNavContent({ onNavigate }: LeftNavContentProps) {
 
 function LeftNav() {
   return (
-    <aside className="hidden w-64 flex-shrink-0 lg:block lg:sticky lg:self-start lg:top-22 lg:max-h-[calc(100vh-5.5rem)] lg:overflow-y-auto">
+    <aside className="hidden w-64 flex-shrink-0 lg:block lg:sticky lg:self-start lg:top-8 lg:max-h-[calc(100vh-7.5rem)] lg:overflow-y-auto">
       <div className="space-y-4 lg:pb-2">
         <LeftNavContent />
       </div>
diff --git a/frontend/src/components/calendar/CalendarSidebar.tsx b/frontend/src/components/calendar/CalendarSidebar.tsx
index b73b52a7..5938524c 100644
--- a/frontend/src/components/calendar/CalendarSidebar.tsx
+++ b/frontend/src/components/calendar/CalendarSidebar.tsx
@@ -6,7 +6,10 @@ import type { CalendarEvent } from "@/services/calendarService";
 
 interface CalendarSidebarProps {
   onOpenCalendarModal: (calendar?: { id?: number; name: string }) => void;
-  onOpenEventModal: (event: any, date?: Date) => void;
+  onOpenEventModal: (
+    event: Partial<CalendarEvent> & { id?: number; calendar?: number | null },
+    date?: Date,
+  ) => void;
   onOpenParticipantsModal: (calendar: { id: number; name: string; user_role?: string }) => void;
   eventsRefreshTrigger: number;
   setEventsRefreshTrigger: (value: number | ((prev: number) => number)) => void;
@@ -20,7 +23,7 @@ interface CalendarSidebarProps {
 export const CalendarSidebar = memo(function CalendarSidebar(props: CalendarSidebarProps) {
   return (
     <aside className="hidden w-72 flex-shrink-0 space-y-4 lg:block">
-      <div className="sticky top-22 space-y-4 lg:pb-2 max-h-[calc(100vh-5.5rem)] overflow-y-auto">
+      <div className="sticky top-8 space-y-4 lg:pb-2 max-h-[calc(100vh-7.5rem)] overflow-y-auto">
         <CalendarCard {...props} />
       </div>
     </aside>