diff --git a/web/package/agama-web-ui.changes b/web/package/agama-web-ui.changes
index 90fe1190a8..37911efdb0 100644
--- a/web/package/agama-web-ui.changes
+++ b/web/package/agama-web-ui.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 19 13:38:16 UTC 2025 - David Diaz <dgonzalez@suse.com>
+
+- Keep margin between sidebar and main content in all breakpoints
+  (gh/agama-project/agama#2370).
+
 -------------------------------------------------------------------
 Fri May 16 07:46:22 UTC 2025 - David Diaz <dgonzalez@suse.com>
 
diff --git a/web/src/assets/styles/index.scss b/web/src/assets/styles/index.scss
index a486e6f2e9..c70db24dbf 100644
--- a/web/src/assets/styles/index.scss
+++ b/web/src/assets/styles/index.scss
@@ -136,6 +136,10 @@
 
 // Reserve the sidebar space also for "lg" breakpoint
 @media (width >= 64rem) {
+  .pf-v6-c-page__main-container {
+    --pf-v6-c-page__main-container--MarginInlineStart: var(--pf-v6-c-page--inset);
+  }
+
   .pf-v6-c-page.agm-full-layout {
     --pf-v6-c-page__sidebar--Width: 12rem; // var(--pf-v6-c-page__sidebar--xl--Width);
     grid-template-areas: