diff --git a/app/agenda/page.tsx b/app/agenda/page.tsx
index 67dfe18..59bc624 100644
--- a/app/agenda/page.tsx
+++ b/app/agenda/page.tsx
@@ -701,8 +701,8 @@ export default async function CalendarPage() {
     }, 0);
 
   return (
-    <main className="w-full bg-white" style={{ height: 'calc(100vh - 4rem)' }}>
-      <div className="w-full h-full px-4 pt-12 pb-4 flex overflow-hidden">
+    <main className="w-full h-full bg-white flex flex-col">
+      <div className="flex-1 px-4 pt-12 pb-4 flex overflow-hidden">
         <CalendarClient 
           initialCalendars={calendars} 
           userId={session.user.id}
diff --git a/components/layout/layout-wrapper.tsx b/components/layout/layout-wrapper.tsx
index beffe26..5d96df4 100644
--- a/components/layout/layout-wrapper.tsx
+++ b/components/layout/layout-wrapper.tsx
@@ -212,7 +212,7 @@ export function LayoutWrapper({ children, isSignInPage, isAuthenticated }: Layou
     <AuthCheck>
       {!isSignInPage && isAuthenticated && <MainNav />}
       <div 
-        className={isSignInPage ? "min-h-screen" : "min-h-screen"}
+        className={isSignInPage ? "min-h-screen" : "flex flex-col"}
         style={
           isSignInPage 
             ? {} // No background style for signin page - let the page component handle it
@@ -223,14 +223,15 @@ export function LayoutWrapper({ children, isSignInPage, isAuthenticated }: Layou
                 backgroundRepeat: 'no-repeat',
                 backgroundAttachment: 'fixed',
                 cursor: 'pointer',
-                transition: 'background-image 0.5s ease-in-out'
+                transition: 'background-image 0.5s ease-in-out',
+                minHeight: 'calc(100vh - 3rem)' // Soustraire la hauteur de la navbar
               }
         }
         onClick={!isSignInPage ? changeBackground : undefined}
       >
-        <main>{children}</main>
+        <main className="flex-1">{children}</main>
+        {!isSignInPage && isAuthenticated && <Footer />}
       </div>
-      {!isSignInPage && isAuthenticated && <Footer />}
       <Toaster />
       
       {/* Notifications stack (calls and emails) */}