diff --git a/app/assets/stylesheets/common/base/lightbox.scss b/app/assets/stylesheets/common/base/lightbox.scss
index dc010a29bc4..681eec62536 100644
--- a/app/assets/stylesheets/common/base/lightbox.scss
+++ b/app/assets/stylesheets/common/base/lightbox.scss
@@ -11,6 +11,7 @@
 
 .lightbox-wrapper {
   display: inline-block;
+  &, * { outline: 0; }
 }
 
 .meta {
diff --git a/app/assets/stylesheets/common/base/magnific-popup.scss b/app/assets/stylesheets/common/base/magnific-popup.scss
index 0c689265a07..98ead180b7b 100644
--- a/app/assets/stylesheets/common/base/magnific-popup.scss
+++ b/app/assets/stylesheets/common/base/magnific-popup.scss
@@ -96,7 +96,7 @@ $use-visuallyhidden:              false !default; // Hide content from browsers,
   height: 100%;
   z-index: $z-index-base + 3;
   position: fixed;
-  outline: none !important;
+  outline: 0 !important;
   -webkit-backface-visibility: hidden; // fixes webkit bug that can cause "false" scrollbar
 }
 
@@ -293,6 +293,7 @@ button {
   &:hover,
   &:focus {
     opacity: 1;
+    outline: 0;
     @if $IE7support {
       filter: unquote("alpha(opacity=#{1*100})");
     }
@@ -348,6 +349,7 @@ button {
     }
     &:hover,
     &:focus {
+      outline: 0;
       opacity: 1;
       @if $IE7support {
         filter: unquote("alpha(opacity=#{1*100})");