diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index a80feaecf2..84f4912db0 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -80,7 +80,7 @@ frappe.Application = Class.extend({
 
 		this.show_update_available();
 
-		if(frappe.ui.startup_setup_dialog) {
+		if(frappe.ui.startup_setup_dialog && !frappe.boot.setup_complete) {
 			frappe.ui.startup_setup_dialog.pre_show();
 			frappe.ui.startup_setup_dialog.show();
 		}
diff --git a/frappe/sessions.py b/frappe/sessions.py
index d4555ddfc6..aaf40f30e7 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -153,6 +153,8 @@ def get():
 	bootinfo["lang"] = frappe.translate.get_user_lang()
 	bootinfo["disable_async"] = frappe.conf.disable_async
 
+	bootinfo["setup_complete"] = cint(frappe.db.get_single_value('System Settings', 'setup_complete'))
+
 	# limits
 	bootinfo.limits = get_limits()
 	bootinfo.expiry_message = get_expiry_message()