diff --git a/app/components/file-preview/component.js b/app/components/file-preview/component.js
index a765e5c..52a28e4 100644
--- a/app/components/file-preview/component.js
+++ b/app/components/file-preview/component.js
@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
-import { observer } from '@ember/object';
+import { computed, observer } from '@ember/object';
 import { alias } from '@ember/object/computed';
 import { scheduleOnce } from '@ember/runloop';
 import JSONTreeView from 'npm:json-tree-view';
@@ -12,6 +12,11 @@ export default Component.extend({
   classNames: ['file-preview'],
 
   fileLoaded: false,
+  uploadingChanges: false,
+
+  showEditor: null,
+  hideEditor: computed.not('showEditor'),
+
   fileContent: null,
   objectURL: null,
   metaData: null,
@@ -123,6 +128,7 @@ export default Component.extend({
 
       if (this.get('isJSON') && this.get('jsonShowTree')) {
         const content = JSON.stringify(this.get('jsonTreeView.value'));
+        this.set('uploadingChanges', true);
 
         this.get('storage.client')
             .storeFile('application/json', path, content)
@@ -135,6 +141,8 @@ export default Component.extend({
             }).catch(err => {
               alert('Failed to update the file. Check the console for more info.');
               console.error(err);
+            }).finally(() => {
+              this.set('uploadingChanges', false);
             });
       } else {
         console.warn('not implemented');
diff --git a/app/components/file-preview/template.hbs b/app/components/file-preview/template.hbs
index 3b3581a..728cccf 100644
--- a/app/components/file-preview/template.hbs
+++ b/app/components/file-preview/template.hbs
@@ -21,8 +21,8 @@
 
   {{#if showEditor}}
     <div class="actions">
-      <button {{action "saveChanges"}}>Save changes</button>
-      <button {{action "cancelEditor"}}>Cancel editing</button>
+      <button {{action "saveChanges"}} disabled={{uploadingChanges}}>Save changes</button>
+      <button {{action "cancelEditor"}} disabled={{uploadingChanges}}>Cancel editing</button>
     </div>
   {{/if}}
 {{/if}}
\ No newline at end of file
diff --git a/app/templates/inspect.hbs b/app/templates/inspect.hbs
index 048979f..3523cfe 100644
--- a/app/templates/inspect.hbs
+++ b/app/templates/inspect.hbs
@@ -60,7 +60,6 @@
                    isJSON=documentIsJSON
                    isEditable=documentIsEditableHide
                    showEditor=documentShowEditor
-                   hideEditor=documentHideEditor
                    jsonShowTree=jsonShowTree
                    jsonShowSource=jsonShowSource}}
   </section>