diff --git a/public/src/admin/modules/search.js b/public/src/admin/modules/search.js
index aafecc9b6d..ae15ad0064 100644
--- a/public/src/admin/modules/search.js
+++ b/public/src/admin/modules/search.js
@@ -50,7 +50,7 @@ define(function() {
 			return false;
 		});
 
-		$('.sidebar-nav a').each(function(idx, link) {
+		$('#main-menu a').each(function(idx, link) {
 			routes.push($(link).attr('href'));
 		});
 
@@ -95,15 +95,14 @@ define(function() {
 					}
 				}
 
-				if (menuItems.html() !== '') {
-					menuItems.append('<li role="presentation" class="divider"></li>');
-				} else {
+				if (menuItems.html() === '') {
 					menuItems.append('<li role="presentation"><a role="menuitem" href="#">No results...</a></li>');
 				}
 			}
 
 			if (value.length > 0) {
 				if (config.searchEnabled) {
+					menuItems.append('<li role="presentation" class="divider"></li>');
 					menuItems.append('<li role="presentation"><a role="menuitem" target="_top" href="' + RELATIVE_PATH + '/search/' + value + '">Search the forum for <strong>' + value + '</strong></a></li>');
 				} else if (value.length < 3) {
 					menuItems.append('<li role="presentation"><a role="menuitem" href="#">Type more to see results...</a></li>');
diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl
index b7d379aebd..078dcecbb6 100644
--- a/src/views/admin/partials/menu.tpl
+++ b/src/views/admin/partials/menu.tpl
@@ -30,9 +30,9 @@
 		</li>
 		<form class="hidden-xs pull-right" role="search">
 			<div class="" id="acp-search" >
-				<div class="dropdown" >
+				<div class="dropdown">
 					<input type="text" data-toggle="dropdown" class="form-control" placeholder="Search...">
-					<ul class="dropdown-menu" role="menu"></ul>
+					<ul class="dropdown-menu dropdown-menu-right" role="menu"></ul>
 				</div>
 			</div>
 		</form>