diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec553efb3..7b90adcfd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * `[beta.2]` — Fixes bug with Terarria and Voice servers reporting a `TypeError: Service is not a constructor` in the daemon due to a missing service configuration.
 * `[beta.2]` — Fixes password reset form throwing a MethodNotAllowed error when accessed.
 * `[beta.2]` — Fixes invalid password bug when attempting to change account email address.
+* `[beta.2]` — New attempt at fixing the issues when rendering files in the browser file editor on certain browsers.
 
 ### Changed
 * Deleting a server safely now continues even if the daemon reports a `HTTP/404` missing server error (requires `Daemon@0.4.0-beta.2.1`)
diff --git a/resources/themes/pterodactyl/server/files/edit.blade.php b/resources/themes/pterodactyl/server/files/edit.blade.php
index e39d4db6b..0d29e2c6c 100644
--- a/resources/themes/pterodactyl/server/files/edit.blade.php
+++ b/resources/themes/pterodactyl/server/files/edit.blade.php
@@ -44,7 +44,9 @@
                 </div>
             </div>
             <input type="hidden" name="file" value="{{ $file }}" />
-            <div class="box-body" style="height:500px;" id="editor">{{ $contents }}</div>
+            <textarea id="editorSetContent" class="hidden">{{ $contents }}</textarea>
+            <div class="overlay" id="editorLoadingOverlay"><i class="fa fa-refresh fa-spin"></i></div>
+            <div class="box-body" style="height:500px;" id="editor"></div>
             <div class="box-footer with-border">
                 <button class="btn btn-sm btn-primary" id="save_file"><i class="fa fa-fw fa-save"></i> &nbsp;@lang('server.files.edit.save')</button>
                 <a href="/server/{{ $server->uuidShort }}/files#{{ rawurlencode($directory) }}" class="pull-right"><button class="btn btn-default btn-sm">{{ trans('server.files.edit.return') }}</button></a>
@@ -61,4 +63,10 @@
     {!! Theme::js('vendor/ace/ext-modelist.js') !!}
     {!! Theme::js('vendor/ace/ext-whitespace.js') !!}
     {!! Theme::js('js/frontend/files/editor.js') !!}
+    <script>
+        $(document).ready(function () {
+            Editor.setValue($('#editorSetContent').val(), -1);
+            $('#editorLoadingOverlay').hide();
+        });
+    </script>
 @endsection