diff --git a/jslib b/jslib
index a72c8a60c1..e2cb9b6bef 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit a72c8a60c1b7a6980bceee456c53a9ea7b9b3451
+Subproject commit e2cb9b6bef54a1bc04174aa9eec02ea800962887
diff --git a/src/app/send/add-edit.component.html b/src/app/send/add-edit.component.html
index be974cbb60..623b2312ad 100644
--- a/src/app/send/add-edit.component.html
+++ b/src/app/send/add-edit.component.html
@@ -1,4 +1,4 @@
-<form (ngSubmit)="submit()" [appApiAction]="formPromise">
+<form #form (ngSubmit)="submit()" [appApiAction]="formPromise">
     <div class="content">
         <div class="inner-content" *ngIf="send">
             <div class="box">
@@ -182,10 +182,11 @@
         </div>
     </div>
     <div class="footer">
-        <button appBlurClick type="submit" class="primary" appA11yTitle="{{'save' | i18n}}" *ngIf="!disableSend">
-            <i class="fa fa-save fa-lg fa-fw" aria-hidden="true"></i>
+        <button appBlurClick type="submit" class="primary btn-submit" appA11yTitle="{{'save' | i18n}}" [disabled]="form.loading" *ngIf="!disableSend">
+            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
+            <span><i class="fa fa-save fa-lg fa-fw" aria-hidden="true"></i></span>
         </button>
-        <button appBlurClick type="button" (click)="cancel()">
+        <button appBlurClick type="button" (click)="cancel()" [disabled]="form.loading">
             {{'cancel' | i18n}}
         </button>
         <div class="right">
diff --git a/src/scss/buttons.scss b/src/scss/buttons.scss
index e0e2204d0d..2a2774dd86 100644
--- a/src/scss/buttons.scss
+++ b/src/scss/buttons.scss
@@ -86,3 +86,29 @@
         }
     }
 }
+
+.btn-submit {
+    position: relative;
+    overflow: hidden;
+
+    .fa-spinner {
+        position: absolute;
+        display: none;
+        align-items: center;
+        justify-content: center;
+        bottom: 0;
+        top: 0;
+        left: 0;
+        right: 0;
+    }
+
+    &:disabled:not(.manual), &.loading {
+        .fa-spinner {
+            display: flex;
+        }
+
+        span {
+            visibility: hidden;
+        }
+    }
+}