diff --git a/framework/core/less/lib/scaffolding.less b/framework/core/less/lib/scaffolding.less
index 1e2ad4e0d..f723d850e 100755
--- a/framework/core/less/lib/scaffolding.less
+++ b/framework/core/less/lib/scaffolding.less
@@ -137,3 +137,10 @@ blockquote ol:last-child {
     margin: 0;
   }
 }
+
+#flarum-loading {
+  text-align: center;
+  padding: 50px 0;
+  font-size: 18px;
+  color: @muted-more-color;
+}
diff --git a/framework/core/views/app.blade.php b/framework/core/views/app.blade.php
index cd46782d7..6eea512f1 100644
--- a/framework/core/views/app.blade.php
+++ b/framework/core/views/app.blade.php
@@ -22,30 +22,35 @@
     <div id="alerts"></div>
 
     @if (! $noJs)
-        @foreach ($scripts as $file)
-          <script src="{{ $forum->attributes->baseUrl . str_replace(public_path(), '', $file) }}"></script>
-        @endforeach
+      <script>
+        document.getElementById('flarum-loading').style.display = 'block';
+      </script>
 
-        <script>
-          @if (! $forum->attributes->debug)
-          try {
-          @endif
-            var app = System.get('flarum/app').default;
+      @foreach ($scripts as $file)
+        <script src="{{ $forum->attributes->baseUrl . str_replace(public_path(), '', $file) }}"></script>
+      @endforeach
 
-            babelHelpers._extends(app, {!! json_encode($app) !!});
+      <script>
+        document.getElementById('flarum-loading').style.display = 'none';
+        @if (! $forum->attributes->debug)
+        try {
+        @endif
+          var app = System.get('flarum/app').default;
 
-            @foreach ($bootstrappers as $bootstrapper)
-              System.get('{{ $bootstrapper }}');
-            @endforeach
+          babelHelpers._extends(app, {!! json_encode($app) !!});
 
-            app.boot();
-          @if (! $forum->attributes->debug)
-          } catch (e) {
-            var nojs = window.location.search ? '&nojs=1' : '?nojs=1';
-            window.location = window.location + nojs;
-          }
-          @endif
-        </script>
+          @foreach ($bootstrappers as $bootstrapper)
+            System.get('{{ $bootstrapper }}');
+          @endforeach
+
+          app.boot();
+        @if (! $forum->attributes->debug)
+        } catch (e) {
+          var nojs = window.location.search ? '&nojs=1' : '?nojs=1';
+          window.location = window.location + nojs;
+        }
+        @endif
+      </script>
     @endif
 
     {!! $foot !!}
diff --git a/framework/core/views/content.blade.php b/framework/core/views/content.blade.php
index c342fe46e..460fb9558 100644
--- a/framework/core/views/content.blade.php
+++ b/framework/core/views/content.blade.php
@@ -1,12 +1,16 @@
+<div id="flarum-loading" style="display: none">
+  {{ $translator->trans('core.basic.loading_text') }}
+</div>
+
 @if (! $noJs) <noscript> @endif
 <div class="Alert">
-    <div class="container">
-        @if ($noJs)
-            {{ $translator->trans('core.basic.load_error_message') }}
-        @else
-            {{ $translator->trans('core.basic.javascript_disabled_message') }}
-        @endif
-    </div>
+  <div class="container">
+    @if ($noJs)
+      {{ $translator->trans('core.basic.load_error_message') }}
+    @else
+      {{ $translator->trans('core.basic.javascript_disabled_message') }}
+    @endif
+  </div>
 </div>
 
 {!! $content !!}