diff --git a/src/app/webide/webide.component.html b/src/app/webide/webide.component.html
index a144a1e..9ae5301 100644
--- a/src/app/webide/webide.component.html
+++ b/src/app/webide/webide.component.html
@@ -22,20 +22,20 @@
 <button type="submit"
         class="btn btn-secondary"
         (click)="sendCode(); deployCode()"
-        [disabled]="deployButtonState === 'DEPLOYING'"
+        [disabled]="deployButtonState === 'DEPLOYING' || deployButtonState === 'DEPLOYED'"
         [class.btn-success]="deployButtonState === 'DEPLOYED'"
         [class.btn-info]="deployButtonState === 'DEPLOYING'"
-        [class.disabled]="deployButtonState === 'DEPLOYING'"
+        [class.disabled]="deployButtonState === 'DEPLOYING' || deployButtonState === 'DEPLOYED'"
 ><span *ngIf="deployButtonState === 'TODEPLOY'">Deploy</span>
  <span *ngIf="deployButtonState === 'DEPLOYED'">Deploy</span>
  <span *ngIf="deployButtonState === 'DEPLOYING'"><div class="loader"></div>Reloading app...</span></button>
 <button (click)="sendCode()"
-        [disabled]="saveButtonState === 'SAVING'"
+        [disabled]="saveButtonState === 'SAVING' || saveButtonState === 'SAVED'"
         type="submit"
         class="btn btn-secondary"
         [class.btn-success]="saveButtonState === 'SAVED'"
         [class.btn-warning]="saveButtonState === 'SAVING'"
-        [class.disabled]="saveButtonState === 'SAVING'"
+        [class.disabled]="saveButtonState === 'SAVING' || saveButtonState === 'SAVED'"
 ><span *ngIf="saveButtonState === 'DIRTY'">Save</span>
  <span *ngIf="saveButtonState === 'SAVED'">Save</span>
  <span *ngIf="saveButtonState === 'SAVING'">Saving...</span></button>