diff --git a/templates/partials/topic/browsing-users.tpl b/templates/partials/topic/browsing-users.tpl
deleted file mode 100644
index a6d7579..0000000
--- a/templates/partials/topic/browsing-users.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<div component="topic/browsing-users" class="inline-block hidden-xs">
-	{{{each browsingUsers}}}
-	<div class="pull-left" data-uid="{browsingUsers.uid}">
-		<a href="<!-- IF browsingUsers.userslug -->{config.relative_path}/user/{browsingUsers.userslug}<!-- ELSE -->#<!-- ENDIF browsingUsers.userslug -->">
-			<!-- IF browsingUsers.picture -->
-			<img class="avatar avatar-sm avatar-rounded" component="user/picture" src="{browsingUsers.picture}" align="left" itemprop="image" title="{browsingUsers.username}"/>
-			<!-- ELSE -->
-			<div class="avatar avatar-sm avatar-rounded" component="user/picture" title="{browsingUsers.username}" style="background-color: {browsingUsers.icon:bgColor};">{browsingUsers.icon:text}</div>
-			<!-- ENDIF browsingUsers.picture -->
-		</a>
-	</div>
-	{{{end}}}
-</div>
\ No newline at end of file
diff --git a/templates/topic.tpl b/templates/topic.tpl
index f5ca416..a42dfa3 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -36,7 +36,11 @@
 				{{{ if !feeds:disableRSS }}}
 				{{{ if rssFeedUrl }}}<a class="hidden-xs" target="_blank" href="{rssFeedUrl}"><i class="fa fa-rss-square"></i></a>{{{ end }}}
 				{{{ end }}}
+				{{{ if browsingUsers }}}
+				<div class="inline-block hidden-xs">
 				<!-- IMPORT partials/topic/browsing-users.tpl -->
+				</div>
+				{{{ end }}}
 
 				<!-- IMPORT partials/post_bar.tpl -->
 			</div>
@@ -71,6 +75,13 @@
 			{{{end}}}
 		</ul>
 
+		{{{ if browsingUsers }}}
+		<div class="visible-xs">
+			<!-- IMPORT partials/topic/browsing-users.tpl -->
+			<hr/>
+		</div>
+		{{{ end }}}
+
 		<!-- IF config.enableQuickReply -->
 		<!-- IMPORT partials/topic/quickreply.tpl -->
 		<!-- ENDIF config.enableQuickReply -->