diff --git a/app/javascript/glitch/components/settings/index.js b/app/javascript/glitch/components/settings/index.js
index 04c05704e7c..ab2e0fb87a1 100644
--- a/app/javascript/glitch/components/settings/index.js
+++ b/app/javascript/glitch/components/settings/index.js
@@ -1,14 +1,15 @@
-//  Package imports  //
+//  Package imports
 import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
 
-import './stylesheet';
-
-//  Our imports  //
+//  Our imports
 import SettingsItem from './item';
 
+//  Stylesheet imports
+import './style';
+
 const messages = defineMessages({
   layout_auto: {  id: 'layout.auto', defaultMessage: 'Auto' },
   layout_desktop: { id: 'layout.desktop', defaultMessage: 'Desktop' },
diff --git a/app/javascript/glitch/components/settings/stylesheet.scss b/app/javascript/glitch/components/settings/style.scss
similarity index 100%
rename from app/javascript/glitch/components/settings/stylesheet.scss
rename to app/javascript/glitch/components/settings/style.scss
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 13ca9ea79e7..f0f7bd619cc 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -3,6 +3,7 @@
   %script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json)
 
   = javascript_pack_tag 'application', integrity: true, crossorigin: 'anonymous'
+  = stylesheet_pack_tag 'application', media: 'all'
 
 .app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
   %noscript
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index 4d865b81637..98e864a665f 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -44,7 +44,10 @@ module.exports = {
 
   plugins: [
     new webpack.EnvironmentPlugin(JSON.parse(JSON.stringify(env))),
-    new ExtractTextPlugin(env.NODE_ENV === 'production' ? '[name]-[hash].css' : '[name].css'),
+    new ExtractTextPlugin({
+      filename: env.NODE_ENV === 'production' ? '[name]-[hash].css' : '[name].css',
+      allChunks: true,
+    }),
     new ManifestPlugin({
       publicPath: output.publicPath,
       writeToFileEmit: true,