diff --git a/public/src/forum/admin/manage/tags.js b/public/src/forum/admin/manage/tags.js
index 460dfb53f7..7a93ff9020 100644
--- a/public/src/forum/admin/manage/tags.js
+++ b/public/src/forum/admin/manage/tags.js
@@ -19,7 +19,7 @@ define('forum/admin/manage/tags', ['forum/infinitescroll', 'admin/selectable'],
 					if (err) {
 						return app.alertError(err.message);
 					}
-					infinitescroll.parseAndTranslate('admin/tags', 'tags', {tags: tags}, function(html) {
+					infinitescroll.parseAndTranslate('admin/manage/tags', 'tags', {tags: tags}, function(html) {
 						$('.tag-list').html(html);
 						utils.makeNumbersHumanReadable(html.find('.human-readable-number'));
 						timeoutId = 0;
@@ -51,7 +51,7 @@ define('forum/admin/manage/tags', ['forum/infinitescroll', 'admin/selectable'],
 
 							tagsToModify.each(function(idx, tag) {
 								tag = $(tag);
-								
+
 								tag.find('[data-name="bgColor"]').val(bgColor);
 								tag.find('[data-name="color"]').val(color);
 								tag.find('.tag-item').css('background-color', bgColor).css('color', color);
diff --git a/src/views/admin/manage/tags.tpl b/src/views/admin/manage/tags.tpl
index 87eb4f0d3b..c83aff9d2e 100644
--- a/src/views/admin/manage/tags.tpl
+++ b/src/views/admin/manage/tags.tpl
@@ -9,9 +9,6 @@
 		<div class="panel panel-default tag-management">
 			<div class="panel-heading">Tag Management</div>
 			<div class="panel-body">
-				<input class="form-control" type="text" id="tag-search" placeholder="Search"/><br/>
-
-
 				<div class="row">
 					<div class="tag-list">
 						<!-- BEGIN tags -->
@@ -45,6 +42,13 @@
 				<button class="btn btn-primary btn-md" id="modify">Modify Selected Tags</button>
 			</div>
 		</div>
+
+		<div class="panel panel-default">
+			<div class="panel-heading">Search for Tags</div>
+			<div class="panel-body">
+				<input class="form-control" type="text" id="tag-search" placeholder="Search..."/><br/>
+			</div>
+		</div>
 	</div>
 	
 </div>
\ No newline at end of file