From 0cb8f2b80c9d8caf5a8538a84e528f0ecfb472fc Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Fri, 21 Aug 2015 22:28:05 -0400
Subject: [PATCH] closes #3463

---
 public/src/admin/settings.js        | 6 +++++-
 src/views/admin/settings/footer.tpl | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js
index 07fe9311ad..97d2ea4a2e 100644
--- a/public/src/admin/settings.js
+++ b/public/src/admin/settings.js
@@ -5,7 +5,11 @@ define('admin/settings', ['uploader', 'sounds'], function(uploader, sounds) {
 	var Settings = {};
 
 	Settings.init = function() {
-		$(window).on('action:config.loaded', Settings.prepare);
+		if (!app.config) {
+			$(window).on('action:config.loaded', Settings.prepare);
+		} else {
+			Settings.prepare();
+		}
 	};
 
 	Settings.populateTOC = function() {
diff --git a/src/views/admin/settings/footer.tpl b/src/views/admin/settings/footer.tpl
index af46d0ad59..fc80967c47 100644
--- a/src/views/admin/settings/footer.tpl
+++ b/src/views/admin/settings/footer.tpl
@@ -6,7 +6,7 @@
 
 <script>
 	require(['admin/settings'], function(Settings) {
-		Settings.prepare();
+		Settings.init();
 		Settings.populateTOC();
 	});
 </script>