diff --git a/client/js/libs/handlebars/slugify.js b/client/js/libs/handlebars/slugify.js
index a8b385e8..e30b8dd5 100644
--- a/client/js/libs/handlebars/slugify.js
+++ b/client/js/libs/handlebars/slugify.js
@@ -1,5 +1,7 @@
 "use strict";
 
+const escape = require("css.escape");
+
 module.exports = function(orig) {
-	return orig.toLowerCase().replace(/[^a-z0-9]/, "-");
+	return escape(orig.toLowerCase());
 };
diff --git a/package.json b/package.json
index cabf7a65..0d25b62e 100644
--- a/package.json
+++ b/package.json
@@ -66,6 +66,7 @@
     "babel-loader": "7.1.2",
     "babel-preset-env": "1.6.0",
     "chai": "4.1.1",
+    "css.escape": "1.5.1",
     "emoji-regex": "6.5.1",
     "eslint": "4.5.0",
     "font-awesome": "4.7.0",