diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js
index 8f0523d32d..4b4c7d0614 100644
--- a/public/src/admin/admin.js
+++ b/public/src/admin/admin.js
@@ -1,6 +1,9 @@
 'use strict';
 
 require('../app');
+// scripts-admin.min contains javascript files
+// from plugins that add files to "acpScripts" block in plugin.json
+require('../../scripts-admin.min');
 
 (function () {
 	let logoutTimer = 0;
diff --git a/public/src/app.js b/public/src/app.js
index 23069aeb40..c459e4d7e8 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -13,11 +13,6 @@ const Visibility = require('visibilityjs');
 const Benchpress = require('benchpressjs');
 
 Benchpress.setGlobal('config', config);
-if (app.inAdmin) {
- 	require('../scripts-admin.min');
-} else {
-	require('../scripts-client.min');
-}
 
 require('./sockets');
 require('./overrides');
diff --git a/public/src/client.js b/public/src/client.js
new file mode 100644
index 0000000000..c88b852e0b
--- /dev/null
+++ b/public/src/client.js
@@ -0,0 +1,6 @@
+'use strict';
+
+require('./app');
+// scripts-client.min contains javascript files
+// from plugins that add files to "scripts" block in plugin.json
+require('../scripts-client.min');
diff --git a/webpack.common.js b/webpack.common.js
index c893f74564..83f1c6e66b 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -23,7 +23,7 @@ module.exports = {
 		new CleanWebpackPlugin(), // cleans dist folder
 	],
 	entry: {
-		nodebb: './build/public/src/app.js',
+		nodebb: './build/public/src/client.js',
 		admin: './build/public/src/admin/admin.js',
 	},
 	output: {