diff --git a/public/js/index.js b/public/js/index.js
index 92acd130a..adc954615 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -1,6 +1,6 @@
 /* eslint-env browser, jquery */
 /* eslint no-console: ["error", { allow: ["warn", "error", "debug"] }] */
-/* global CodeMirror, Cookies, moment, Spinner, Idle, serverurl,
+/* global CodeMirror, Cookies, moment, Idle, serverurl,
    key, Dropbox, ot, hex2rgb, Visibility */
 
 import TurndownService from 'turndown'
@@ -10,6 +10,7 @@ import randomColor from 'randomcolor'
 import store from 'store'
 import hljs from 'highlight.js'
 import url from 'wurl'
+import { Spinner } from 'spin.js'
 
 import _ from 'lodash'
 
diff --git a/webpack.common.js b/webpack.common.js
index 35fdba08e..3883ea2ad 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -239,6 +239,7 @@ module.exports = {
       path.join(__dirname, 'node_modules/codemirror/theme/one-dark.css'),
       path.join(__dirname, 'node_modules/codemirror/mode/tiddlywiki/tiddlywiki.css'),
       path.join(__dirname, 'node_modules/codemirror/mode/mediawiki/mediawiki.css'),
+      path.join(__dirname, 'node_modules/spin.js/spin.css'),
       path.join(__dirname, 'public/css/github-extract.css'),
       path.join(__dirname, 'public/vendor/showup/showup.css'),
       path.join(__dirname, 'public/css/mermaid.css'),
@@ -253,7 +254,6 @@ module.exports = {
     ],
     'index-pack': [
       'babel-polyfill',
-      'expose-loader?exposes=Spinner!spin.js',
       'script-loader!jquery-ui-resizable',
       'bootstrap-validator',
       'expose-loader?exposes=jsyaml!js-yaml',