diff --git a/apps/workflowengine/js/workflowengine.js b/apps/workflowengine/js/workflowengine.js
index 139de55f7691daad537da26834998f213d30f45f..f1aaa5245ada663e4930523245527dbbf5a67f83 100644
Binary files a/apps/workflowengine/js/workflowengine.js and b/apps/workflowengine/js/workflowengine.js differ
diff --git a/apps/workflowengine/js/workflowengine.js.map b/apps/workflowengine/js/workflowengine.js.map
index 045713abf7ddbb7ca29793f07a5e5ac78ad2ba57..ecdfbf8f7faa27144a0e81e0dbd65f6641a45796 100644
Binary files a/apps/workflowengine/js/workflowengine.js.map and b/apps/workflowengine/js/workflowengine.js.map differ
diff --git a/apps/workflowengine/src/admin.js b/apps/workflowengine/src/admin.js
index f4635fe5b8c60a075cb91c838a97779d13b6bd6a..92f485a8b4c389c301876f367b17f907e7d1d38c 100644
--- a/apps/workflowengine/src/admin.js
+++ b/apps/workflowengine/src/admin.js
@@ -22,22 +22,6 @@ import OperationTemplate from './templates/operation.handlebars';
 import OperationsTemplate from './templates/operations.handlebars';
 
 (function() {
-	Handlebars.registerHelper('selectItem', function(currentValue, itemValue) {
-		if (currentValue === itemValue) {
-			return 'selected="selected"';
-		}
-
-		return "";
-	});
-
-	Handlebars.registerHelper('getOperators', function(classname) {
-		var check = OCA.WorkflowEngine.getCheckByClass(classname);
-		if (!_.isUndefined(check)) {
-			return check['operators'];
-		}
-		return [];
-	});
-
 	OCA.WorkflowEngine = _.extend(OCA.WorkflowEngine || {}, {
 		availablePlugins: [],
 		availableChecks: [],
diff --git a/apps/workflowengine/src/hbs_helpers/getOperators.js b/apps/workflowengine/src/hbs_helpers/getOperators.js
new file mode 100644
index 0000000000000000000000000000000000000000..4e3606fe82c6147b28d52c6c7fa830f8c9ed6beb
--- /dev/null
+++ b/apps/workflowengine/src/hbs_helpers/getOperators.js
@@ -0,0 +1,7 @@
+module.exports = function(classname) {
+	var check = OCA.WorkflowEngine.getCheckByClass(classname);
+	if (!_.isUndefined(check)) {
+		return check['operators'];
+	}
+	return [];
+}
diff --git a/apps/workflowengine/src/hbs_helpers/selectItem.js b/apps/workflowengine/src/hbs_helpers/selectItem.js
new file mode 100644
index 0000000000000000000000000000000000000000..594e3debaddb95476b2ca592f631402c58724641
--- /dev/null
+++ b/apps/workflowengine/src/hbs_helpers/selectItem.js
@@ -0,0 +1,7 @@
+module.exports = function(currentValue, itemValue) {
+	if (currentValue === itemValue) {
+		return 'selected="selected"';
+	}
+
+	return "";
+}
diff --git a/apps/workflowengine/webpack.js b/apps/workflowengine/webpack.js
index c85aef591d8113825d865ec2903b304f7c26a1e1..7cf6024573c8750ea5a2bf99dcf67cdd51d42dad 100644
--- a/apps/workflowengine/webpack.js
+++ b/apps/workflowengine/webpack.js
@@ -31,11 +31,14 @@ module.exports = {
 			},
 			{
 				test: /\.handlebars$/,
-				loader: "handlebars-loader"
-			}
+				loader: "handlebars-loader",
+				options: {
+					helperDirs: path.join(__dirname, 'src/hbs_helpers'),
+				}
+			},
 		]
 	},
 	resolve: {
-		extensions: ['*', '.js']
+		extensions: ['*', '.js', '.handlebars']
 	}
 };