diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_alerts.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_alerts.scss
index 0db7cf1ee1781..0c5ba36b84ee6 100644
--- a/build/media_source/templates/site/cassiopeia/scss/blocks/_alerts.scss
+++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_alerts.scss
@@ -23,3 +23,13 @@
     transform: translateY(0);
   }
 }
+
+/* Only apply margin when #system-message-container contains a visible joomla-alert */
+#system-message-container:has(joomla-alert) {
+  margin-top: 1em;
+}
+
+/* Remove margin when no <joomla-alert> exists */
+#system-message-container:not(:has(joomla-alert)) {
+  margin-top: 0;
+}