diff --git a/src/opnsense/mvc/app/views/layouts/default.volt b/src/opnsense/mvc/app/views/layouts/default.volt
index 022532811..b0c7ddc37 100644
--- a/src/opnsense/mvc/app/views/layouts/default.volt
+++ b/src/opnsense/mvc/app/views/layouts/default.volt
@@ -167,6 +167,7 @@
 				</div>
 				<div class="collapse navbar-collapse">
 					<ul class="nav navbar-nav navbar-right">
+						<li id="menu_messages"><a href="#">{{session_username}}@{{system_hostname}}.{{system_domain}}</a></li>
 						<li>
 							<form class="navbar-form" role="search">
 								<div class="input-group">
@@ -175,7 +176,6 @@
 								</div>
 							</form>
 						</li>
-						<li id="menu_messages"><a href="#">{{session_username}}@{{system_hostname}}.{{system_domain}}</a></li>
 					</ul>
 				</div>
 			</div>
diff --git a/src/www/fbegin.inc b/src/www/fbegin.inc
index ff8ef4a54..b3e6c4afb 100644
--- a/src/www/fbegin.inc
+++ b/src/www/fbegin.inc
@@ -111,6 +111,7 @@ if($need_alert_display == true) {
       </div>
       <div class="collapse navbar-collapse">
         <ul class="nav navbar-nav navbar-right">
+          <li id="menu_messages"><?= get_menu_messages() ?></li>
           <li>
             <form class="navbar-form" role="search">
               <div class="input-group">
@@ -119,7 +120,6 @@ if($need_alert_display == true) {
               </div>
             </form>
           </li>
-          <li id="menu_messages"><?= get_menu_messages() ?></li>
         </ul>
       </div>
     </div>