diff --git a/src/app/components/dialog-confirm-close-calc/dialog-confirm-close-calc.component.html b/src/app/components/dialog-confirm-close-calc/dialog-confirm-close-calc.component.html
index f1abc0500a58e9143591b98877d6575857a7fbcf..71434bd13bd56b06ba8b71dcd05b346768ecd54c 100644
--- a/src/app/components/dialog-confirm-close-calc/dialog-confirm-close-calc.component.html
+++ b/src/app/components/dialog-confirm-close-calc/dialog-confirm-close-calc.component.html
@@ -13,7 +13,7 @@
 
 <p [innerHTML]="uitextCloseCalcBody"></p>
 
-<div mat-dialog-actions>
+<div mat-dialog-actions [attr.align]="'end'">
   <button mat-raised-button color="primary" [mat-dialog-close]="false" cdkFocusInitial>
     {{ uitextNo }}
   </button>
diff --git a/src/app/components/dialog-confirm-empty-session/dialog-confirm-empty-session.component.html b/src/app/components/dialog-confirm-empty-session/dialog-confirm-empty-session.component.html
index 699ae97867ba412c354569bf1aab09429deffc7d..7d7d6cdc8fb91784d029edf13cb69c078ab37c0c 100644
--- a/src/app/components/dialog-confirm-empty-session/dialog-confirm-empty-session.component.html
+++ b/src/app/components/dialog-confirm-empty-session/dialog-confirm-empty-session.component.html
@@ -2,7 +2,7 @@
 <div mat-dialog-content>
   <p [innerHTML]="uitextEmptySessionBody"></p>
 </div>
-<div mat-dialog-actions>
+<div mat-dialog-actions [attr.align]="'end'">
   <button mat-raised-button color="primary" [mat-dialog-close]="false" cdkFocusInitial>
     {{ uitextNo }}
   </button>
diff --git a/src/app/components/dialog-edit-param-computed/dialog-edit-param-computed.component.html b/src/app/components/dialog-edit-param-computed/dialog-edit-param-computed.component.html
index 517a0f0d1a378c689b6a7aabfef85ae47c944daf..8e56fa40849187df03c20fdcd96a8221dc6c5008 100644
--- a/src/app/components/dialog-edit-param-computed/dialog-edit-param-computed.component.html
+++ b/src/app/components/dialog-edit-param-computed/dialog-edit-param-computed.component.html
@@ -6,7 +6,7 @@
     <ngparam-input [title]="param.title" ></ngparam-input>
   </div>
 
-  <div mat-dialog-actions>
+  <div mat-dialog-actions [attr.align]="'end'">
     <button mat-raised-button [mat-dialog-close]="true" cdkFocusInitial>
       {{ uitextClose }}
     </button>
diff --git a/src/app/components/dialog-edit-param-values/dialog-edit-param-values.component.html b/src/app/components/dialog-edit-param-values/dialog-edit-param-values.component.html
index 43f8a3a0f3565893efd03a7ae3ba2616cbc4ff10..95d01272b42f95091b63e907b84d97eadf5a6e50 100644
--- a/src/app/components/dialog-edit-param-values/dialog-edit-param-values.component.html
+++ b/src/app/components/dialog-edit-param-values/dialog-edit-param-values.component.html
@@ -121,7 +121,7 @@
         </chart>
   </div>
 
-  <div mat-dialog-actions>
+  <div mat-dialog-actions [attr.align]="'end'">
     <div *ngIf="isMinMax || viewChart">
         <button mat-raised-button [mat-dialog-close]="true" cdkFocusInitial>
             {{ uitextClose }}
diff --git a/src/app/components/dialog-generate-pab/dialog-generate-pab.component.html b/src/app/components/dialog-generate-pab/dialog-generate-pab.component.html
index e94097590f0adfb339aa7661ab63c57367bd15d1..14202deecd17f1de7c5a8bc248dcdc84c93ddfc9 100644
--- a/src/app/components/dialog-generate-pab/dialog-generate-pab.component.html
+++ b/src/app/components/dialog-generate-pab/dialog-generate-pab.component.html
@@ -36,7 +36,7 @@
 
   </div>
 
-  <div mat-dialog-actions>
+  <div mat-dialog-actions [attr.align]="'end'">
     <button mat-raised-button color="primary" [mat-dialog-close]="false" cdkFocusInitial>
       {{ uitextCancel }}
     </button>
diff --git a/src/app/components/dialog-load-session/dialog-load-session.component.html b/src/app/components/dialog-load-session/dialog-load-session.component.html
index 89554f085b2a56fa9e49b8077cdb6786f7fd5e83..84ea1c729742c56e15dd0d45184afd5fcc84a670 100644
--- a/src/app/components/dialog-load-session/dialog-load-session.component.html
+++ b/src/app/components/dialog-load-session/dialog-load-session.component.html
@@ -57,7 +57,7 @@
     </mat-checkbox>
   </div>
 
-  <div mat-dialog-actions>
+  <div mat-dialog-actions [attr.align]="'end'">
     <button mat-raised-button color="primary" [mat-dialog-close]="false" cdkFocusInitial>
       {{ uitextCancel }}
     </button>
diff --git a/src/app/components/dialog-log-entries-details/dialog-log-entries-details.component.html b/src/app/components/dialog-log-entries-details/dialog-log-entries-details.component.html
index ef999517ca0d7675b13b92ec6901b3dac51f2805..a5dd7a17fd6216ee1eec3f6ff2504e15a21a2b7f 100644
--- a/src/app/components/dialog-log-entries-details/dialog-log-entries-details.component.html
+++ b/src/app/components/dialog-log-entries-details/dialog-log-entries-details.component.html
@@ -3,7 +3,7 @@
     <!-- entrées du journal -->
     <log-entry *ngFor="let m of data.messages" [_message]="m"></log-entry>
 </div>
-<div mat-dialog-actions>
+<div mat-dialog-actions [attr.align]="'end'">
   <button mat-raised-button [mat-dialog-close]="true">
     {{ uitextClose }}
   </button>
diff --git a/src/app/components/dialog-save-session/dialog-save-session.component.html b/src/app/components/dialog-save-session/dialog-save-session.component.html
index d4f2324cc1b63149ee0bd5c0b87cf7594a254054..4e522ee37715e047227c5e56381d47fe263e22c8 100644
--- a/src/app/components/dialog-save-session/dialog-save-session.component.html
+++ b/src/app/components/dialog-save-session/dialog-save-session.component.html
@@ -35,7 +35,7 @@
     </mat-form-field>
   </div>
 
-  <div mat-dialog-actions>
+  <div mat-dialog-actions [attr.align]="'end'">
     <button mat-raised-button color="primary" [mat-dialog-close]="false" cdkFocusInitial>
       {{ uitextCancel }}
     </button>
diff --git a/src/app/components/fixedvar-results/var-results.component.ts b/src/app/components/fixedvar-results/var-results.component.ts
index a58eb8ea78d1ec086e3f4d46c860ece511256c4b..7a97e80c6028145b7443e1cb61c1b9ce9df197f2 100644
--- a/src/app/components/fixedvar-results/var-results.component.ts
+++ b/src/app/components/fixedvar-results/var-results.component.ts
@@ -2,13 +2,14 @@ import { Component, ViewChild, ElementRef } from "@angular/core";
 
 import { MatDialog } from "@angular/material";
 
+import * as XLSX from "xlsx";
+
 import { VarResults } from "../../results/var-results";
 import { ApplicationSetupService } from "../../services/app-setup/app-setup.service";
 import { ResultElement, Message, MessageSeverity } from "jalhyd";
 import { I18nService } from "../../services/internationalisation/internationalisation.service";
-import * as XLSX from "xlsx";
 import { ResultsComponent } from "./results.component";
-import { DialogLogEntriesDetailsComponent } from '../dialog-log-entries-details/dialog-log-entries-details.component';
+import { DialogLogEntriesDetailsComponent } from "../dialog-log-entries-details/dialog-log-entries-details.component";
 
 @Component({
     selector: "var-results",
diff --git a/src/app/components/param-computed/param-computed.component.ts b/src/app/components/param-computed/param-computed.component.ts
index 2abb701ebb7d8deade121b89782691f1fd5a925a..b95fe29eab7a7343612f8e0bcdb3d19390d0550d 100644
--- a/src/app/components/param-computed/param-computed.component.ts
+++ b/src/app/components/param-computed/param-computed.component.ts
@@ -53,7 +53,8 @@ export class ParamComputedComponent {
             {
                 data: {
                     param: this.param
-                }
+                },
+                autoFocus: false
             }
         );
     }
diff --git a/src/app/components/param-values/param-values.component.ts b/src/app/components/param-values/param-values.component.ts
index 27cc698b50f0a0b1ecf478bc682e141069e45a35..41cefb196e912a830554167f5c8207b8478c8ce2 100644
--- a/src/app/components/param-values/param-values.component.ts
+++ b/src/app/components/param-values/param-values.component.ts
@@ -60,7 +60,8 @@ export class ParamValuesComponent implements AfterViewInit, Observer {
                 disableClose: true,
                 data: {
                     param: this.param
-                }
+                },
+                autoFocus: false
             }
         );
     }