diff --git a/core/js/dist/main.js b/core/js/dist/main.js
index 6f3aed9e61e2d33f93c6834040ffa15e532d99fb..88a1a7e7f2da759f55608ce82221b11794f8aaa5 100644
Binary files a/core/js/dist/main.js and b/core/js/dist/main.js differ
diff --git a/core/js/dist/main.js.map b/core/js/dist/main.js.map
index 85baca5f6f80619b9c66c7977a55d7db7cb3ea74..640216863c87d66938f7653a8fded702ac6cc0df 100644
Binary files a/core/js/dist/main.js.map and b/core/js/dist/main.js.map differ
diff --git a/core/src/globals.js b/core/src/globals.js
index 0ea4954d543e696c146dee6ecc1944d71265aa11..9209ea72627fe5e779f3b2aaf0e0de45e047ddbe 100644
--- a/core/src/globals.js
+++ b/core/src/globals.js
@@ -42,8 +42,8 @@ import jstimezonedetect from 'jstimezonedetect'
 import marked from 'marked'
 import md5 from 'blueimp-md5'
 import moment from 'moment'
-import Select2 from 'select2'
-import 'select2/select2.css'
+import 'Select2'
+import 'Select2/select2.css'
 import 'snap.js/dist/snap'
 import 'strengthify'
 import 'strengthify/strengthify.css'
@@ -63,4 +63,3 @@ window['jQuery'] = $
 window['marked'] = marked
 window['md5'] = md5
 window['moment'] = moment
-window['Select2'] = Select2
diff --git a/package-lock.json b/package-lock.json
index f1eab0f5e7a5c20aef29e54b8f8470529824ce72..8fe739ca1b4459d9e3a2b352a3b18e3e540447d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2584,12 +2584,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -2604,17 +2606,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -2731,7 +2736,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -2743,6 +2749,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -2757,6 +2764,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -2764,12 +2772,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -2788,6 +2798,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -2868,7 +2879,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -2880,6 +2892,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3001,6 +3014,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4739,11 +4753,6 @@
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
       "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
     },
-    "select2": {
-      "version": "3.4.5",
-      "resolved": "https://registry.npmjs.org/select2/-/select2-3.4.5.tgz",
-      "integrity": "sha1-wFVe132iKx1ALsnhppaHq8FedHo="
-    },
     "semver": {
       "version": "5.6.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
diff --git a/package.json b/package.json
index 605dbb81e94b54b79c573c75a8c1b75d69a9f02f..0debb3383e862c36c9488b9560b5e599be597023 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "jstimezonedetect": "^1.0.6",
     "marked": "^0.3.6",
     "moment": "^2.18.1",
-    "select2": "^3.4.5",
+    "select2": "https://github.com/select2/select2#3.4.8",
     "snap.js": "^2.0.9",
     "strengthify": "git+https://github.com/MorrisJobke/strengthify.git",
     "underscore": "^1.8.3"