diff --git a/administrator/templates/isis/html/layouts/joomla/system/message.php b/administrator/templates/isis/html/layouts/joomla/system/message.php
index e83b8a0fde927..923417157418f 100644
--- a/administrator/templates/isis/html/layouts/joomla/system/message.php
+++ b/administrator/templates/isis/html/layouts/joomla/system/message.php
@@ -15,11 +15,11 @@
 ?>
 <div id="system-message-container">
 	<?php if (is_array($msgList) && $msgList) : ?>
-		<button type="button" class="close" data-dismiss="alert">&times;</button>
 		<?php foreach ($msgList as $type => $msgs) : ?>
 			<div class="alert <?php echo isset($alert[$type]) ? $alert[$type] : 'alert-' . $type; ?>">
-				<h4 class="alert-heading"><?php echo JText::_($type); ?></h4>
-				<?php if ($msgs) : ?>
+				<button type="button" class="close" data-dismiss="alert">&times;</button>
+				<?php if (!empty($msgs)) : ?>
+					<h4 class="alert-heading"><?php echo JText::_($type); ?></h4>
 					<?php foreach ($msgs as $msg) : ?>
 						<div class="alert-message"><?php echo $msg; ?></div>
 					<?php endforeach; ?>