diff --git a/frontend/src/app/components/header-nav/header-nav.component.html b/frontend/src/app/components/header-nav/header-nav.component.html
index feccbf02..9ea95c15 100644
--- a/frontend/src/app/components/header-nav/header-nav.component.html
+++ b/frontend/src/app/components/header-nav/header-nav.component.html
@@ -119,6 +119,7 @@
               : null
           "
         >
+          <span *ngIf="deploymentRunningForStage == 'PRELIVE'" class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
           {{ publishToPreliveButtonText() }}
         </button>
         <button
@@ -175,17 +176,29 @@
       class="btn btn-success mr-2"
       type="button"
       (click)="requestPublishRulesTxtToSolr('LIVE')"
+      [attr.disabled]="
+        !currentSolrIndexId || deploymentRunningForStage == 'LIVE'
+        ? ''
+        : null
+        "
     >
-      <i class="fa fa-thumbs-up smui-icon"></i>
-      Yes, publish to LIVE
+      <i *ngIf="deploymentRunningForStage != 'LIVE'" class="fa fa-thumbs-up smui-icon"></i>
+      <span *ngIf="deploymentRunningForStage == 'LIVE'" class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+      {{ publishToLiveButtonText() }}
+
     </button>
     <button
       class="btn btn-danger"
       type="button"
       (click)="modalService.close('confirm-publish-live')"
+      [attr.disabled]="
+        !currentSolrIndexId || deploymentRunningForStage == 'LIVE'
+        ? ''
+        : null
+        "
     >
       <i class="fa fa-ban smui-icon"></i>
-      No, cancel publish
+      Cancel publish
     </button>
   </div>
 </app-smui-modal>
diff --git a/frontend/src/app/components/header-nav/header-nav.component.ts b/frontend/src/app/components/header-nav/header-nav.component.ts
index 8b14fbde..d08c4630 100644
--- a/frontend/src/app/components/header-nav/header-nav.component.ts
+++ b/frontend/src/app/components/header-nav/header-nav.component.ts
@@ -88,14 +88,14 @@ export class HeaderNavComponent implements OnInit {
       this.solrService
         .updateRulesTxtForSolrIndex(this.currentSolrIndexId, targetPlatform)
         .then(apiResult => {
-          this.deploymentRunningForStage = undefined
           this.modalService.close('confirm-publish-live')
+          this.deploymentRunningForStage = undefined
           this.showSuccessMsg(apiResult.message)
           this.loadLatestDeploymentLogInfo()
         })
         .catch(error => {
-          this.deploymentRunningForStage = undefined
           this.modalService.close('confirm-publish-live')
+          this.deploymentRunningForStage = undefined
           this.showErrorMsg(error.error.message)
         });
     } // TODO handle else-case, if no currentSolrIndexId selected