diff --git a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
index 6334cc005c..9eacc2f166 100644
--- a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
+++ b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
@@ -259,8 +259,10 @@ frappe.search.AwesomeBar = Class.extend({
 		this.recent = JSON.parse(frappe.boot.user.recent || "[]") || [];
 	},
 
-	fuzzy_search: function(txt, _item) {
-		item = __(_item || '').replace(/-/g, " ");
+	fuzzy_search: function(_txt, _item) {
+		parsed_item = __(_item || '').replace(/-/g, " ");
+		item = parsed_item.toLowerCase();
+		txt = _txt.toLowerCase();
 
 		var ilen = item.length;
 		var tlen = txt.length;
@@ -271,13 +273,12 @@ frappe.search.AwesomeBar = Class.extend({
 		if (tlen > ilen) {
 			return [];
 		}
-		if (item.indexOf(txt) !== -1) {
+		if (txt !== _txt && parsed_item.indexOf(_txt) !== -1) {
 			var regEx = new RegExp("("+ txt +")", "ig");
 			rendered_label = _item.replace(regEx, '<b>$1</b>');
+			console.log("first", _txt, parsed_item);
 			return [_item, ilen/50, rendered_label];
 		}
-		item = item.toLowerCase();
-		txt = txt.toLowerCase();
 		if (item.indexOf(txt) !== -1) {
 			var regEx = new RegExp("("+ txt +")", "ig");
 			rendered_label = _item.replace(regEx, '<b>$1</b>');
diff --git a/frappe/website/router.py b/frappe/website/router.py
index 2f98509a9a..460cd6c6ec 100644
--- a/frappe/website/router.py
+++ b/frappe/website/router.py
@@ -334,6 +334,8 @@ def sync_global_search():
 	from frappe.utils.global_search import sync_global_search
 	from bs4 import BeautifulSoup
 
+	if frappe.flags.update_global_search:
+		sync_global_search()
 	frappe.flags.update_global_search = []
 	frappe.session.user = 'Guest'
 	frappe.local.no_cache = True