diff --git a/src/app/common/progress-dialog/progress-dialog.service.ts b/src/app/common/progress-dialog/progress-dialog.service.ts
index 07b757dc..ab7e4462 100644
--- a/src/app/common/progress-dialog/progress-dialog.service.ts
+++ b/src/app/common/progress-dialog/progress-dialog.service.ts
@@ -8,7 +8,8 @@ export class ProgressDialogService {
 
   public open() {
     const ref = this.dialog.open(ProgressDialogComponent, {
-      width: '250px'
+      width: '250px',
+      autoFocus: false
     });
     return ref;
   }
diff --git a/src/app/components/preferences/common/delete-template-component/delete-template.component.ts b/src/app/components/preferences/common/delete-template-component/delete-template.component.ts
index d4495bea..b300866a 100644
--- a/src/app/components/preferences/common/delete-template-component/delete-template.component.ts
+++ b/src/app/components/preferences/common/delete-template-component/delete-template.component.ts
@@ -26,7 +26,8 @@ export class DeleteTemplateComponent {
             height: '250px',
             data: {
                 templateName: templateName
-            }
+            },
+            autoFocus: false
         });
       
         dialogRef.afterClosed().subscribe((answer: boolean) => {
diff --git a/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts
index 5234c05b..ea7e8cdf 100644
--- a/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts
@@ -20,7 +20,8 @@ export class EditStyleActionComponent implements OnInit {
 
   editStyle() {
     const dialogRef = this.dialog.open(StyleEditorDialogComponent, {
-      width: '300px'
+      width: '300px',
+      autoFocus: false
     });
     let instance = dialogRef.componentInstance;
     instance.server = this.server;
diff --git a/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts
index cc2f0720..2486a0c7 100644
--- a/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts
@@ -20,7 +20,8 @@ export class EditTextActionComponent implements OnInit {
 
   editText() {
     const dialogRef = this.dialog.open(TextEditorDialogComponent, {
-      width: '300px'
+      width: '300px',
+      autoFocus: false
     });
     let instance = dialogRef.componentInstance;
     instance.server = this.server;
diff --git a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts
index 6536836c..523860fe 100644
--- a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts
+++ b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts
@@ -83,7 +83,8 @@ export class AddBlankProjectDialogComponent implements OnInit {
       height: '150px',
       data: {
         existingProject: existingProject
-      }
+      },
+      autoFocus: false
     });
 
     dialogRef.afterClosed().subscribe((answer: boolean) => {
diff --git a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts
index 59ad09ee..07a76027 100644
--- a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts
+++ b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts
@@ -106,7 +106,8 @@ export class ImportProjectDialogComponent implements OnInit {
       height: '150px',
       data: {
         existingProject: existingProject
-      }
+      },
+      autoFocus: false
     });
 
     dialogRef.afterClosed().subscribe((answer: boolean) => {
diff --git a/src/app/components/projects/projects.component.ts b/src/app/components/projects/projects.component.ts
index f6ae4fbb..02741faf 100644
--- a/src/app/components/projects/projects.component.ts
+++ b/src/app/components/projects/projects.component.ts
@@ -109,7 +109,8 @@ export class ProjectsComponent implements OnInit {
 
   addBlankProject() {
     const dialogRef = this.dialog.open(AddBlankProjectDialogComponent, {
-      width: '400px'
+      width: '400px',
+      autoFocus: false
     });
     let instance = dialogRef.componentInstance;
     instance.server = this.server;
@@ -117,7 +118,8 @@ export class ProjectsComponent implements OnInit {
 
   importProject() {
     const dialogRef = this.dialog.open(ImportProjectDialogComponent, {
-      width: '400px'
+      width: '400px',
+      autoFocus: false
     });
     let instance = dialogRef.componentInstance;
     instance.server = this.server;
diff --git a/src/app/components/servers/servers.component.ts b/src/app/components/servers/servers.component.ts
index 57cdba3c..d487e2d4 100644
--- a/src/app/components/servers/servers.component.ts
+++ b/src/app/components/servers/servers.component.ts
@@ -69,7 +69,8 @@ export class ServersComponent implements OnInit, OnDestroy {
 
   createModal() {
     const dialogRef = this.dialog.open(AddServerDialogComponent, {
-      width: '350px'
+      width: '350px',
+      autoFocus: false
     });
 
     dialogRef.afterClosed().subscribe(server => {
diff --git a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts
index 066a31e3..78a806b8 100644
--- a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts
+++ b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts
@@ -34,7 +34,8 @@ export class SnapshotMenuItemComponent implements OnInit {
       data: {
         server: this.server,
         project: this.project
-      }
+      },
+      autoFocus: false
     });
 
     dialogRef.afterClosed().subscribe(snapshot => {
diff --git a/src/app/components/template/template.component.ts b/src/app/components/template/template.component.ts
index 5a3e4986..9b6675ca 100644
--- a/src/app/components/template/template.component.ts
+++ b/src/app/components/template/template.component.ts
@@ -24,7 +24,8 @@ export class TemplateComponent implements OnInit {
       height: '560px',
       data: {
         server: this.server
-      }
+      },
+      autoFocus: false
     });
 
     dialogRef.afterClosed().subscribe((template: Template) => {