diff --git a/CHANGELOG.md b/CHANGELOG.md
index eba13f2d..f96c33bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,6 +74,14 @@
 * [#1047](https://github.com/foosel/OctoPrint/issues/1047) - Fixed 90 degree
   webcam rotation for iOS Safari.
 
+## 1.2.17rc3 (2016-10-13)
+
+### Bug fixes
+
+  * Fixed a wrong order in loading JS files on the client introduced in 1.2.17rc2 to make the UI more resilient against broken plugin JS.
+
+([Commits](https://github.com/foosel/OctoPrint/compare/1.2.17rc2...1.2.17rc3))
+
 ## 1.2.17rc2 (2016-10-13)
 
 ### Improvements
diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py
index bbf89430..ca08f05d 100644
--- a/src/octoprint/server/__init__.py
+++ b/src/octoprint/server/__init__.py
@@ -1044,7 +1044,7 @@ class Server(object):
 		     "js/app/helpers.js",
 		     "js/app/main.js"]
 		js_plugins = dynamic_plugin_assets["external"]["js"]
-		js_app = js_core + js_plugins
+		js_app = js_plugins + js_core
 
 		css_libs = [
 			"css/bootstrap.min.css",