closes #3463

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() {

src/views/admin/settings/footer.tpl

@@ -6,7 +6,7 @@
 
 <script>
 	require(['admin/settings'], function(Settings) {
-		Settings.prepare();
+		Settings.init();
 		Settings.populateTOC();
 	});
 </script>