diff --git a/SafeguardDevOpsService/ClientApp/src/app/main/main.component.html b/SafeguardDevOpsService/ClientApp/src/app/main/main.component.html
index 049296eb..8c4035b6 100644
--- a/SafeguardDevOpsService/ClientApp/src/app/main/main.component.html
+++ b/SafeguardDevOpsService/ClientApp/src/app/main/main.component.html
@@ -117,9 +117,8 @@
 
             <div class='buttons'>
               <div class='left'>
-                <button mat-button class='link-button' (click)="createCSR('Client')" color="primary">Create a
-                  Certificate
-                  Signing Request (CSR)</button>
+                <button mat-button class='link-button' (click)="createCSR($event,'Client')" color="primary">
+                  Create a Certificate Signing Request (CSR)</button>
               </div>
               <div class='right'>
                 <app-progress-spinner color="accent" diameter="32" message='Uploading Certificate'
diff --git a/SafeguardDevOpsService/ClientApp/src/app/main/main.component.ts b/SafeguardDevOpsService/ClientApp/src/app/main/main.component.ts
index 03968455..adce08ca 100644
--- a/SafeguardDevOpsService/ClientApp/src/app/main/main.component.ts
+++ b/SafeguardDevOpsService/ClientApp/src/app/main/main.component.ts
@@ -443,7 +443,11 @@ export class MainComponent implements OnInit, AfterViewInit {
       );
   }
 
-  createCSR(certificateType: string): void {
+  createCSR(event: any, certificateType: string): void {
+    if (event && event.currentTarget) {
+      event.currentTarget.blur();
+    }
+
     const dialogRef = this.dialog.open(CreateCsrComponent, {
       data: { certificateType }
     });
@@ -480,7 +484,7 @@ export class MainComponent implements OnInit, AfterViewInit {
         if (dlgResult?.result === UploadCertificateResult.ViewCertificate) {
           this.viewCertificate(null, certificateType);
         } else if (dlgResult?.result === UploadCertificateResult.CreateCSR) {
-          this.createCSR(certificateType);
+          this.createCSR(e, certificateType);
         }
         return of(); // Nothing more to do
       }),
diff --git a/SafeguardDevOpsService/ClientApp/src/app/save-csr/save-csr.component.scss b/SafeguardDevOpsService/ClientApp/src/app/save-csr/save-csr.component.scss
index d7f541c0..a522cbd2 100644
--- a/SafeguardDevOpsService/ClientApp/src/app/save-csr/save-csr.component.scss
+++ b/SafeguardDevOpsService/ClientApp/src/app/save-csr/save-csr.component.scss
@@ -1,5 +1,6 @@
 .save-csr-container {
   min-height: 500px;
+  padding: 20px;
 }