diff --git a/lib/templates/full_header.mustache b/lib/templates/full_header.mustache
index 531cedae036..e1f2fc6ef04 100644
--- a/lib/templates/full_header.mustache
+++ b/lib/templates/full_header.mustache
@@ -45,19 +45,21 @@
             </div>
         </div>
         <div class="d-flex align-items-center">
-            {{^welcomemessage}}
+            <div class="me-auto d-flex flex-column">
                 {{#contextheader}}
-                    <div class="me-auto">
-                        {{{contextheader}}}
-                    </div>
+                <div>
+                    {{{contextheader}}}
+                </div>
                 {{/contextheader}}
-            {{/welcomemessage}}
-            {{> core/welcome }}
+                <div>
+                    {{> core/welcome }}
+                </div>
+            </div>
             <div class="header-actions-container ms-auto" data-region="header-actions-container">
                 {{#headeractions}}
-                    <div class="header-action ms-2">{{{.}}}</div>
+                <div class="header-action ms-2">{{{.}}}</div>
                 {{/headeractions}}
             </div>
         </div>
     </div>
-</header>
+</header>
\ No newline at end of file
diff --git a/lib/templates/welcome.mustache b/lib/templates/welcome.mustache
index 7f9bfa8553d..1365e1d3092 100644
--- a/lib/templates/welcome.mustache
+++ b/lib/templates/welcome.mustache
@@ -25,7 +25,7 @@
     }
 }}
 {{#welcomemessage}}
-<h1 class="h2 mb-3 mt-3">
-    {{.}}
-</h1>
-{{/welcomemessage}}
+<div class="mb-2">
+    <span class="h2">{{.}}</span>
+</div>
+{{/welcomemessage}}
\ No newline at end of file
diff --git a/theme/boost/tests/behat/welcome_to_moodle.feature b/theme/boost/tests/behat/welcome_to_moodle.feature
index e95698a58db..abd6c6fcc3e 100644
--- a/theme/boost/tests/behat/welcome_to_moodle.feature
+++ b/theme/boost/tests/behat/welcome_to_moodle.feature
@@ -8,7 +8,7 @@ Feature: Welcome message on boost
     Given the following config values are set as admin:
       | defaulthomepage | 0 |
     When I log in as "admin"
-    Then I should not see "Acceptance test site" in the "page-header" "region"
+    Then I should see "Acceptance test site" in the "page-header" "region"
     And I should see "Welcome, Admin!" in the "page-header" "region"
     And I reload the page
     And I should not see "Welcome, Admin!" in the "page-header" "region"
@@ -18,7 +18,7 @@ Feature: Welcome message on boost
     Given the following config values are set as admin:
       | defaulthomepage | 1 |
     When I log in as "admin"
-    Then I should not see "Dashboard" in the "page-header" "region"
+    Then I should see "Dashboard" in the "page-header" "region"
     And I should see "Welcome, Admin!" in the "page-header" "region"
     And I reload the page
     And I should not see "Welcome, Admin!" in the "page-header" "region"
@@ -28,7 +28,7 @@ Feature: Welcome message on boost
     Given the following config values are set as admin:
       | defaulthomepage | 3 |
     When I log in as "admin"
-    Then I should not see "My courses" in the "page-header" "region"
+    Then I should see "My courses" in the "page-header" "region"
     And I should see "Welcome, Admin!" in the "page-header" "region"
     And I reload the page
     And I should not see "Welcome, Admin!" in the "page-header" "region"