diff --git a/src/pages/watch/watch.html b/src/pages/watch/watch.html
index 0d8f699..916ac87 100644
--- a/src/pages/watch/watch.html
+++ b/src/pages/watch/watch.html
@@ -82,23 +82,27 @@
 
     <div  class="group">
 
-      <div [hidden]="watchModel.id!==null">
+      <div  [hidden]="watchModel.id!==null">
         <button
+        [disabled]="submitAttempt"
         ion-button  
         color="primary" type="submit"> 
-        {{ 'add-watch' | translate }}
+        <span [hidden]="submitAttempt">{{ 'add-watch' | translate }}</span>
+        <ion-spinner [hidden]="!submitAttempt"></ion-spinner>
         </button>
       </div>
     
       <div [hidden]="watchModel.id===null">
-          <button ion-button color="accent" type="submit"
+          <button [disabled]="submitAttempt" ion-button color="accent" type="submit"
           > 
-          {{ 'update-watch' | translate }}
+          <span [hidden]="submitAttempt">{{ 'update-watch' | translate }}</span>
+          <ion-spinner [hidden]="!submitAttempt"></ion-spinner>
           </button>
 
-          <button ion-button color="danger"
+          <button [disabled]="submitAttempt" ion-button color="danger"
           (click)="onDelete()"> 
-          {{ 'delete-watch' | translate }}
+          <span [hidden]="submitAttempt">{{ 'delete-watch' | translate }}</span>
+          <ion-spinner [hidden]="!submitAttempt"></ion-spinner>
           </button>
       </div>
 
diff --git a/src/pages/watch/watch.scss b/src/pages/watch/watch.scss
index 1e0118d..55cbabb 100644
--- a/src/pages/watch/watch.scss
+++ b/src/pages/watch/watch.scss
@@ -21,6 +21,13 @@ ion-content#watch{
 		width: 100%;
 	}
 
+	ion-spinner * {
+	  width: 28px;
+	  height: 28px;
+	  stroke: white;
+	  fill: white;
+	}
+
 	
 	input               {
 	  font-size:18px;
diff --git a/src/share b/src/share
index 4e53361..3bd4b1f 160000
--- a/src/share
+++ b/src/share
@@ -1 +1 @@
-Subproject commit 4e53361ff739c38281a9ffee7a797cceaecbc46f
+Subproject commit 3bd4b1f7f0c66bae6b19bc91f2ba014a9fbff193