diff --git a/templates/recent.tpl b/templates/recent.tpl
index cd779fa..e78392d 100644
--- a/templates/recent.tpl
+++ b/templates/recent.tpl
@@ -13,14 +13,15 @@
 		<div class="alert alert-warning hide" id="new-topics-alert"></div>
 	</a>
 
-	<!-- IF !topics.length -->
-	<div class="alert alert-warning" id="category-no-topics">
-		<strong>[[recent:no_recent_topics]]</strong>
-	</div>
-	<!-- ENDIF !topics.length -->
-
 	<div class="category">
 		<p>Recent</p>
+
+		<!-- IF !topics.length -->
+		<div class="alert alert-warning" id="category-no-topics">
+			<strong>[[recent:no_recent_topics]]</strong>
+		</div>
+		<!-- ENDIF !topics.length -->
+
 		<!-- IMPORT partials/topics_list.tpl -->
 	</div>
 </div>
\ No newline at end of file
diff --git a/templates/unread.tpl b/templates/unread.tpl
index 56215bf..f0616a1 100644
--- a/templates/unread.tpl
+++ b/templates/unread.tpl
@@ -1,9 +1,7 @@
 <div class="unread">
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 
-	<div id="category-no-topics" class="alert alert-warning <!-- IF topics.length -->hidden<!-- ENDIF topics.length -->">
-		<strong>[[unread:no_unread_topics]]</strong>
-	</div>
+
 
 	<div class="markread btn-group <!-- IF !topics.length -->hidden<!-- ENDIF !topics.length -->">
 		<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
@@ -28,6 +26,11 @@
 
 	<div class="category">
 		<p>Unread</p>
+
+		<div id="category-no-topics" class="alert alert-warning <!-- IF topics.length -->hidden<!-- ENDIF topics.length -->">
+			<strong>[[unread:no_unread_topics]]</strong>
+		</div>
+
 		<!-- IMPORT partials/topics_list.tpl -->
 		<button id="load-more-btn" class="btn btn-primary hide">[[unread:load_more]]</button>
 	</div>