diff --git a/src/demo-app/a11y/dialog/dialog-address-form-a11y.html b/src/demo-app/a11y/dialog/dialog-address-form-a11y.html
index 8a95e7a89be5..abbeb3440645 100644
--- a/src/demo-app/a11y/dialog/dialog-address-form-a11y.html
+++ b/src/demo-app/a11y/dialog/dialog-address-form-a11y.html
@@ -40,6 +40,6 @@ <h2 mat-dialog-title>Company</h2>
 </mat-dialog-content>
 
 <mat-dialog-actions>
-  <button mat-raised-button color="primary" mat-dialog-close>Submit</button>
   <button mat-raised-button mat-dialog-close>Close</button>
+  <button mat-raised-button color="primary" mat-dialog-close cdkFocusInitial>Submit</button>
 </mat-dialog-actions>
diff --git a/src/demo-app/a11y/dialog/dialog-fruit-a11y.html b/src/demo-app/a11y/dialog/dialog-fruit-a11y.html
index cb303d41d829..d69c69611d95 100644
--- a/src/demo-app/a11y/dialog/dialog-fruit-a11y.html
+++ b/src/demo-app/a11y/dialog/dialog-fruit-a11y.html
@@ -1,6 +1,6 @@
 <h2 mat-dialog-title>Fruit</h2>
 <div mat-dialog-content>Which would you like to choose?</div>
 <div mat-dialog-actions>
-  <button mat-button mat-dialog-close="apple" aria-label="Apple">Apple</button>
   <button mat-button mat-dialog-close="peach" aria-label="Peach">Peach</button>
+  <button mat-button mat-dialog-close="apple" aria-label="Apple">Apple</button>
 </div>
diff --git a/src/material-examples/dialog-content/dialog-content-example-dialog.html b/src/material-examples/dialog-content/dialog-content-example-dialog.html
index 2ecde77595ea..2da84e735cec 100644
--- a/src/material-examples/dialog-content/dialog-content-example-dialog.html
+++ b/src/material-examples/dialog-content/dialog-content-example-dialog.html
@@ -4,7 +4,7 @@ <h3>DEVELOP ACROSS ALL PLATFORMS</h3>
   <p>Learn one way to build applications with Angular and reuse your code and abilities to build 
     apps for any deployment target. For web, mobile web, native mobile and native desktop.</p>
   
-  <h3>SPEED & PERFORMANCE</h3>
+  <h3>SPEED &amp; PERFORMANCE</h3>
   <p>Achieve the maximum speed possible on the Web Platform today, and take it further, via Web 
     Workers and server-side rendering. Angular puts you in control over scalability. Meet huge data requirements 
     by building data models on RxJS, Immutable.js or another push-model.</p>
@@ -20,6 +20,6 @@ <h3>LOVED BY MILLIONS</h3>
     that supports Google's largest applications.</p>
 </mat-dialog-content>
 <mat-dialog-actions>
-  <button mat-button [mat-dialog-close]="true" tabindex="1">Install</button>
-  <button mat-button mat-dialog-close tabindex="-1">Cancel</button>
+  <button mat-button mat-dialog-close>Cancel</button>
+  <button mat-button [mat-dialog-close]="true" cdkFocusInitial>Install</button>
 </mat-dialog-actions>
diff --git a/src/material-examples/dialog-overview/dialog-overview-example-dialog.html b/src/material-examples/dialog-overview/dialog-overview-example-dialog.html
index fbd80e3c287d..d9fa6e802de9 100644
--- a/src/material-examples/dialog-overview/dialog-overview-example-dialog.html
+++ b/src/material-examples/dialog-overview/dialog-overview-example-dialog.html
@@ -6,6 +6,6 @@ <h1 mat-dialog-title>Hi {{data.name}}</h1>
   </mat-form-field>
 </div>
 <div mat-dialog-actions>
-  <button mat-button [mat-dialog-close]="data.animal" tabindex="2">Ok</button>
-  <button mat-button (click)="onNoClick()" tabindex="-1">No Thanks</button>
+  <button mat-button (click)="onNoClick()">No Thanks</button>
+  <button mat-button [mat-dialog-close]="data.animal" cdkFocusInitial>Ok</button>
 </div>