diff --git a/theme/classic/templates/core/full_header.mustache b/theme/classic/templates/core/full_header.mustache
index 461486e4972..7152accbe99 100644
--- a/theme/classic/templates/core/full_header.mustache
+++ b/theme/classic/templates/core/full_header.mustache
@@ -57,6 +57,12 @@
                 </div>
             </div>
         </div>
-        {{> core/welcome }}
+        {{#welcomemessage}}
+            <div class="card border-0 mt-3">
+                <div class="card-body py-0">
+                    {{> core/welcome }}
+                </div>
+            </div>
+        {{/welcomemessage}}
     </div>
 </header>