diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 7d3daf6c9e8..34c25a7d1a3 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -28,14 +28,14 @@
= javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous'
= csrf_meta_tags
- - if Setting.custom_css.present?
- = stylesheet_link_tag custom_css_path, media: 'all'
-
= yield :header_tags
-# These must come after :header_tags to ensure our initial state has been defined.
= render partial: 'layouts/theme', object: @core
= render partial: 'layouts/theme', object: @theme
+ - if Setting.custom_css.present?
+ = stylesheet_link_tag custom_css_path, media: 'all'
+
%body{ class: body_classes }
= content_for?(:content) ? yield(:content) : yield