diff --git a/scripts/Client.js b/scripts/Client.js
index eb3c33d..409fab7 100644
--- a/scripts/Client.js
+++ b/scripts/Client.js
@@ -22,11 +22,16 @@ var Client = (function(client) {
   
   client.startPicker = function () {
   
+    // disable inserting and saving
+    Process.control.buttons.insert.disabled = Process.control.buttons.save.disabled = true;
+    
     google.script.run
       .withFailureHandler(function(error) {
         App.showNotification ("Failed to save", error);
+        Process.control.buttons.insert.disabled = Process.control.buttons.save.disabled = false;
       })
       .withSuccessHandler(function (result) {
+         Process.control.buttons.insert.disabled = Process.control.buttons.save.disabled = false;
       })
       .startPicker(Process.control.code.svg.value,Process.control.code.picker.value);
   };
@@ -34,14 +39,17 @@ var Client = (function(client) {
   client.insertImage = function (png) {
   
     spinCursor();
-    
+    Process.control.buttons.insert.disabled = Process.control.buttons.save.disabled = true;
+     
     google.script.run
       .withFailureHandler(function(error) {
         resetCursor();
         App.showNotification ("Failed to insert image", error);
+        Process.control.buttons.insert.disabled = Process.control.buttons.save.disabled = false;
       })
       .withSuccessHandler(function (result) {
         resetCursor();
+        Process.control.buttons.insert.disabled = Process.control.buttons.save.disabled = false;
       })
       .insertImage(png);
   };