diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblightbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblightbox.directive.js
index 0874c54cd2..268d62723e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblightbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblightbox.directive.js
@@ -77,7 +77,7 @@
 (function() {
     'use strict';
 
-    function LightboxDirective() {
+    function LightboxDirective(focusLockService) {
 
         function link(scope, el, attr, ctrl) {
 
@@ -88,6 +88,9 @@
 
                 el.appendTo("body");
 
+                
+                focusLockService.addInertAttribute();
+
                 // clean up
                 scope.$on('$destroy', function() {
                     // unbind watchers
@@ -95,6 +98,9 @@
                         eventBindings[e]();
                     }
                     
+                    focusLockService.removeInertAttribute();
+
+                    document.getElementsByClassName("umb-lightbox__close")[0].blur();
                     el.remove();
                 });
             }
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-lightbox.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-lightbox.html
index 751375bbde..71e18769ab 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-lightbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-lightbox.html
@@ -2,7 +2,7 @@
 
     <div class="umb-lightbox__backdrop" ng-click="close()" hotkey="esc"></div>
 
-    <button type="button" class="btn-reset umb-lightbox__close" localize="title" title="@general_close" ng-click="close()">
+    <button type="button" umb-auto-focus class="btn-reset umb-lightbox__close" localize="title" title="@general_close" ng-click="close()">
         <umb-icon icon="icon-delete" class="umb-lightbox__control"></umb-icon>
         <span class="sr-only">
             <localize key="general_close">Close</localize>
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.controller.js
index a3405bc2bf..8360663be6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/repo.controller.js
@@ -168,18 +168,31 @@
                     vm.pagination.totalPages = Math.ceil(pack.total / vm.pagination.pageSize);
                 });
         }
+        var previousElement = null;
 
         function openLightbox(itemIndex, items) {
+
+            previousElement = ( document.activeElement || document.body );
+
             vm.lightbox = {
                 show: true,
                 items: items,
-                activeIndex: itemIndex
+                activeIndex: itemIndex,
+                focus: true
             };
         }
 
         function closeLightbox() {
             vm.lightbox.show = false;
             vm.lightbox = null;
+
+            if(previousElement){
+
+                setTimeout(function(){ 
+                    previousElement.focus();
+                    previousElement = null;
+                  }, 100) 
+            }
         }