diff --git a/app/assets/javascripts/wizard/components/wizard-field.js.es6 b/app/assets/javascripts/wizard/components/wizard-field.js.es6
index 4b09212fbeb..27d291d4c06 100644
--- a/app/assets/javascripts/wizard/components/wizard-field.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-field.js.es6
@@ -7,7 +7,7 @@ export default Ember.Component.extend({
   typeClass: type => `${Ember.String.dasherize(type)}-field`,
 
   @computed('field.id')
-  fieldClass: id => `field-${Ember.String.dasherize(id)}`,
+  fieldClass: id => `field-${Ember.String.dasherize(id)} wizard-focusable`,
 
   @computed('field.type', 'field.id')
   inputComponentName(type, id) {
diff --git a/app/assets/javascripts/wizard/components/wizard-step.js.es6 b/app/assets/javascripts/wizard/components/wizard-step.js.es6
index b0a0618ab2e..c8b628f24cd 100644
--- a/app/assets/javascripts/wizard/components/wizard-step.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-step.js.es6
@@ -48,7 +48,11 @@ export default Ember.Component.extend({
 
   keyPress(key) {
     if (key.keyCode === 13) {
-      this.send('nextStep');
+      if (this.get('showDoneButton')) {
+        this.send('quit');
+      } else {
+        this.send('nextStep');
+      }
     }
   },
 
@@ -63,13 +67,13 @@ export default Ember.Component.extend({
 
   autoFocus() {
     Ember.run.scheduleOnce('afterRender', () => {
-      const $invalid = $('.wizard-field.invalid:eq(0) input');
+      const $invalid = $('.wizard-field.invalid:eq(0) .wizard-focusable');
 
       if ($invalid.length) {
         return $invalid.focus();
       }
 
-      $('input:eq(0)').focus();
+      $('.wizard-focusable:eq(0)').focus();
     });
   },
 
diff --git a/app/assets/javascripts/wizard/templates/components/invite-list.hbs b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
index fb0299b704d..6b383776682 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
@@ -9,7 +9,7 @@
 
 <div class="new-user">
   <div class="text-field {{if invalid 'invalid'}}">
-    {{input class="invite-email" value=inviteEmail placeholder="user@example.com"}}
+    {{input class="invite-email wizard-focusable" value=inviteEmail placeholder="user@example.com" tabindex="9"}}
   </div>
 
   {{combo-box value=inviteRole content=roles nameProperty="label" width="200px"}}
diff --git a/app/assets/javascripts/wizard/templates/components/radio-button.hbs b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
index c7636811889..3973d91324a 100644
--- a/app/assets/javascripts/wizard/templates/components/radio-button.hbs
+++ b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
@@ -1,5 +1,5 @@
 <div class='radio-area'>
-  <input type="radio" name={{label}}>
+  <input type="radio" name={{label}} tabindex="9">
   <span class='radio-label'>
     {{#if icon}}
       {{fa-icon icon}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs
index 6be3fc1a8d5..06e7034c148 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs
@@ -3,4 +3,5 @@
             value=field.value
             content=field.choices
             nameProperty="label"
-            width="400px"}}
+            width="400px"
+            tabindex="9"}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-text.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-text.hbs
index 0a5d877a82e..7e53f27dc23 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field-text.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-text.hbs
@@ -1 +1 @@
-{{input elementId=field.id value=field.value class=fieldClass placeholder=field.placeholder}}
+{{input elementId=field.id value=field.value class=fieldClass placeholder=field.placeholder tabindex="9"}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-textarea.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-textarea.hbs
index 8e2c042aff2..14707f3a87a 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field-textarea.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-textarea.hbs
@@ -1 +1 @@
-{{textarea elementId=field.id value=field.value class=fieldClass placeholder=field.placeholder}}
+{{textarea elementId=field.id value=field.value class=fieldClass placeholder=field.placeholder tabindex="9"}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
index 0395db92680..18ffac5463e 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -30,22 +30,22 @@
 
   <div class='wizard-buttons'>
     {{#if showQuitButton}}
-      <a href {{action "quit"}} class='action-link quit'>{{i18n "wizard.quit"}}</a>
+      <a href {{action "quit"}} class='action-link quit' tabindex="11">{{i18n "wizard.quit"}}</a>
     {{/if}}
 
     {{#if showBackButton}}
-      <a href {{action "backStep"}} class='action-link back'>{{i18n "wizard.back"}}</a>
+      <a href {{action "backStep"}} class='action-link back' tabindex="11">{{i18n "wizard.back"}}</a>
     {{/if}}
 
     {{#if showNextButton}}
-      <button class='wizard-btn next primary' {{action "nextStep"}} disabled={{saving}}>
+      <button class='wizard-btn next primary' {{action "nextStep"}} disabled={{saving}} tabindex="10">
         {{i18n "wizard.next"}}
         {{fa-icon "chevron-right"}}
       </button>
     {{/if}}
 
     {{#if showDoneButton}}
-      <button class='wizard-btn done' {{action "quit"}} disabled={{saving}}>
+      <button class='wizard-btn done' {{action "quit"}} disabled={{saving}} tabindex="10">
         {{i18n "wizard.done"}}
       </button>
     {{/if}}
diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index bae9a0f28c8..8cffd2c879b 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -175,7 +175,6 @@ body.wizard {
     font-size: 1.0em;
     border: 0px;
     padding: 0.5em;
-    outline: 0;
     transition: background-color .3s;
     margin-right: 0.5em;
 
@@ -390,7 +389,6 @@ body.wizard {
     padding: 6px;
     border: 1px solid #ccc;
     transition: border-color .5s;
-    outline: none;
   }
 
   &.invalid {