diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index 425686d07..0ec6b12b2 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -650,11 +650,18 @@ section {
   }
 }
 
-.form-section-notification, .form-section-notification fieldset {
+.form-section-notification {
   display: grid;
   grid-template-columns: 1fr 3fr;
   grid-gap: 5px;
 
+  fieldset {
+    display: grid;
+    grid-template-columns: 1fr 3fr;
+    grid-gap: 5px;
+    grid-column: 1/3;
+  }
+
   .notification {
     margin: 0;
   }
@@ -669,9 +676,14 @@ section {
 }
 
 @media (max-width: 768px) {
-  .form-section-notification, .form-section-notification fieldset {
+  .form-section-notification {
     grid-template-columns: 1fr;
     margin-top: 17px;
+
+    fieldset {
+      grid-template-columns: 1fr;
+      grid-column: 1/2;
+    }
   }
 
   .notification {