diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js
index 381ecc76c3..53ff989c7d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js
@@ -14,16 +14,18 @@
 (function () {
     'use strict';
 
-    function TourStepDirective() {
+    function TourStepDirective(focusLockService) {
 
         function link(scope, element, attrs, ctrl) {
 
             scope.close = function () {
                 if (scope.onClose) {
-                   scope.onClose();
+                  scope.onClose();
+                  focusLockService.removeInertAttribute();
                 }
             }
 
+            focusLockService.addInertAttribute();
         }
 
         var directive = {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
index 064dcf6945..76baebc645 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
@@ -1,4 +1,4 @@
-<div class="umb-tour">
+<div class="umb-tour" tabindex="0" role="dialog" aria-label="tour">
 
     <umb-loader class="umb-tour__loader" ng-if="loadingStep"></umb-loader>
 
@@ -29,7 +29,7 @@
                                 total-steps="model.steps.length">
                             </umb-tour-step-counter>
                             <div ng-if="model.allowDisable && model.currentStep.type === 'intro'">
-                                <button type="button" class="underline" ng-click="model.disableTour()" prevent-default>Don't show this tour again</button>
+                                <button type="button" class="underline" ng-click="model.disableTour()" tabindex="0" prevent-default>Don't show this tour again</button>
                             </div>
                         </div>
 
@@ -58,7 +58,7 @@
                 </umb-tour-step-content>
 
                 <umb-tour-step-footer>
-                    <umb-button type="button" button-style="action" size="m" action="model.completeTour()" label="Complete"></umb-button>
+                    <umb-button type="button" button-style="action" size="m" action="model.completeTour()" label="Complete" tabindex="0"></umb-button>
                 </umb-tour-step-footer>
 
             </umb-tour-step>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-content.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-content.html
index 0010a2bc6d..225e93bd86 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-content.html
@@ -1,4 +1,4 @@
 <div class="umb-tour-step__content">
-    <div ng-bind-html="content"></div>
+    <div ng-bind-html="content" tabindex="0"></div>
     <div ng-transclude></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-counter.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-counter.html
index bd4e0127d2..3a3fed00b4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-counter.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-counter.html
@@ -1 +1 @@
-<div class="umb-tour-step__counter">{{ currentStep }}/{{ totalSteps }}</div>
\ No newline at end of file
+<div class="umb-tour-step__counter" tabindex="0">{{ currentStep }}/{{ totalSteps }}</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-header.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-header.html
index e34aa2025c..f4cdf0bdbd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step-header.html
@@ -1,4 +1,4 @@
 <div class="umb-tour-step__header">
-    <div class="umb-tour-step__title">{{title}}</div>
+    <div class="umb-tour-step__title" id="step-title" tabindex="0">{{title}}</div>
     <div ng-transclude></div>
-</div>
\ No newline at end of file
+</div>