diff --git a/TODO.md b/TODO.md
index 6edb4d7..f505286 100644
--- a/TODO.md
+++ b/TODO.md
@@ -5,3 +5,4 @@
 - [x] Replace JS toast system with pure HTMX toast fragment (top-right, CSS-only auto-fade)
 - [x] Separate admin views from controllers: move all HTML to `templates/admin/*.php`, fragments to `templates/admin/partials/`
 - [x] Add SMTP test email button in parametres.php (action + CSS)
+- [x] Lock body scroll on all pages (admin + public); only `main` or inner element scrolls
diff --git a/app/public/assets/css/admin.css b/app/public/assets/css/admin.css
index d8d8858..63c9ef7 100644
--- a/app/public/assets/css/admin.css
+++ b/app/public/assets/css/admin.css
@@ -8,7 +8,8 @@
 .admin-body {
     display: flex;
     flex-direction: column;
-    min-height: 100vh;
+    height: 100%;
+    overflow: hidden;
 }
 
 /* Keep admin header single-row like public header */
@@ -49,6 +50,8 @@
 
 .admin-body main {
     flex: 1;
+    min-height: 0;
+    overflow-y: auto;
     padding: var(--space-l) var(--space-l) var(--space-2xl);
     max-width: 1100px;
     width: 100%;
diff --git a/app/public/assets/css/apropos.css b/app/public/assets/css/apropos.css
index 9112303..d7b312a 100644
--- a/app/public/assets/css/apropos.css
+++ b/app/public/assets/css/apropos.css
@@ -10,6 +10,8 @@
 
 .apropos-main {
     flex: 1;
+    min-height: 0;
+    overflow-y: auto;
     padding: var(--space-xl) var(--space-l) var(--space-2xl);
 }
 
diff --git a/app/public/assets/css/tfe.css b/app/public/assets/css/tfe.css
index 960d1c7..056a5c1 100644
--- a/app/public/assets/css/tfe.css
+++ b/app/public/assets/css/tfe.css
@@ -6,6 +6,8 @@
 
 .tfe-main {
     flex: 1;
+    min-height: 0;
+    overflow-y: auto;
     padding: var(--space-l) var(--space-m) var(--space-xl);
 }