diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 8bab291ebb..3ef3cc6d1f 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -36,7 +36,7 @@ define(function() {
 
 			app.enterRoom('topic_' + tid);
 
-			if($('#post-container .sub-posts').length > 1) {
+			if($('#post-container .posts').length > 1) {
 				$('.topic-main-buttons').removeClass('hide').parent().removeClass('hide');
 			}
 
@@ -799,7 +799,7 @@ define(function() {
 
 			var count = 0, smallestNonNegative = 0;
 
-			jQuery('.sub-posts').each(function() {
+			jQuery('.posts > .post-row').each(function() {
 				count++;
 				this.postnumber = count;
 
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 87b87a93bf..a2a8a47e6f 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -72,7 +72,6 @@
 					<!-- END navigation -->
 				</ul>
 
-
 				<ul id="logged-in-menu" class="nav navbar-nav navbar-right hide">
 					<li>
 						<a href="#" id="reconnect"></a>
@@ -135,11 +134,15 @@
 					</li>
 				</ul>
 
-				<div class="pagination-block">
-					<i class="icon-upload pointer"></i>
-					<span id="pagination"></span>
-					<i class="icon-upload pointer icon-rotate-180"></i>
-				</div>
+				<ul class="nav navbar-nav navbar-right pagination-block">
+					<li class="active">
+						<a>
+							<i class="icon-upload pointer"></i>
+							<span id="pagination"></span>
+							<i class="icon-upload pointer icon-rotate-180"></i>
+						</a>
+					</li>
+				</ul>
 			</div>
 		</div>
 	</div>