diff --git a/app/assets/javascripts/sitewide/file_preview.js b/app/assets/javascripts/sitewide/file_preview.js
index d692ed11b..b751aa4b6 100644
--- a/app/assets/javascripts/sitewide/file_preview.js
+++ b/app/assets/javascripts/sitewide/file_preview.js
@@ -269,6 +269,7 @@ var FilePreviewModal = (function() {
       'colorpicker.title.color': '#fff'
     };
 
+    animateSpinner(null, true);
     imageEditor = new tui.ImageEditor('#tui-image-editor', {
       includeUI: {
         loadImage: {
@@ -295,6 +296,7 @@ var FilePreviewModal = (function() {
 
     imageEditor.on('image_loaded', () => {
       $('.file-save-link').css('display', '');
+      animateSpinner(null, false);
     });
 
     ps = new PerfectScrollbar($('.tui-image-editor-wrap')[0], { wheelSpeed: 0.5 });