diff --git a/frappe/public/js/desk.bundle.js b/frappe/public/js/desk.bundle.js
index 677b012efe..99b644a5c7 100644
--- a/frappe/public/js/desk.bundle.js
+++ b/frappe/public/js/desk.bundle.js
@@ -1,7 +1,7 @@
+import "./frappe/provide.js";
 import "./frappe/translate.js";
 import "./frappe/class.js";
 import "./frappe/polyfill.js";
-import "./frappe/provide.js";
 import "./frappe/assets.js";
 import "./frappe/format.js";
 import "./frappe/form/formatters.js";
diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index 4563875b91..64767e1232 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -271,7 +271,6 @@ frappe.Application = class Application {
 		if(frappe.boot) {
 			this.setup_workspaces();
 			frappe.model.sync(frappe.boot.docs);
-			$.extend(frappe._messages, frappe.boot.__messages);
 			this.check_metadata_cache_status();
 			this.set_globals();
 			this.sync_pages();
diff --git a/frappe/public/js/frappe/provide.js b/frappe/public/js/frappe/provide.js
index d4d0fdffb8..5180a6761f 100644
--- a/frappe/public/js/frappe/provide.js
+++ b/frappe/public/js/frappe/provide.js
@@ -31,6 +31,7 @@ frappe.provide('frappe.utils');
 frappe.provide('frappe.model');
 frappe.provide('frappe.user');
 frappe.provide('frappe.session');
+frappe.provide("frappe._messages");
 frappe.provide('locals.DocType');
 
 // for listviews
diff --git a/frappe/public/js/frappe/translate.js b/frappe/public/js/frappe/translate.js
index 825a3b9219..ca407329aa 100644
--- a/frappe/public/js/frappe/translate.js
+++ b/frappe/public/js/frappe/translate.js
@@ -2,11 +2,7 @@
 // MIT License. See license.txt
 
 // for translation
-frappe._messages = {};
 frappe._ = function(txt, replace, context = null) {
-	if ($.isEmptyObject(frappe._messages) && frappe.boot) {
-		$.extend(frappe._messages, frappe.boot.__messages);
-	}
 	if (!txt) return txt;
 	if (typeof txt != "string") return txt;
 
diff --git a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
index 502837bcd7..9ff8fe96f3 100644
--- a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
+++ b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
@@ -74,7 +74,7 @@ frappe.search.AwesomeBar = class AwesomeBar {
 
 			awesomplete.list = me.deduplicate(me.options);
 
-		}, 500));
+		}, 100));
 
 		var open_recent = function() {
 			if (!this.autocomplete_open) {
diff --git a/frappe/www/app.html b/frappe/www/app.html
index 37579066e0..4402dbb481 100644
--- a/frappe/www/app.html
+++ b/frappe/www/app.html
@@ -38,17 +38,16 @@
 		<div id="build-events-overlay"></div>
 
 		<script type="text/javascript">
-		window._version_number = "{{ build_version }}";
-		// browser support
-		window.app = true;
-		window.dev_server = {{ dev_server }};
+			window._version_number = "{{ build_version }}";
+			// browser support
+			window.app = true;
+			window.dev_server = {{ dev_server }};
 
-		if(!window.frappe) window.frappe = {};
-
-		frappe.boot = {{ boot }};
-
-		frappe.csrf_token = "{{ csrf_token }}";
+			if (!window.frappe) window.frappe = {};
 
+			frappe.boot = {{ boot }};
+			frappe._messages = frappe.boot["__messages"];
+			frappe.csrf_token = "{{ csrf_token }}";
 		</script>
 
 	{% for include in include_js %}