diff --git a/theme-base/components/messages/_message.scss b/theme-base/components/messages/_message.scss
index a9a722a..8d6dfe9 100644
--- a/theme-base/components/messages/_message.scss
+++ b/theme-base/components/messages/_message.scss
@@ -17,9 +17,10 @@
             background: rgba(255,255,255,.3);
         }
 
-        &:focus {
+        &:focus-visible {
             @include focused();
         }
+    
     }
 
     &.p-message-info {
diff --git a/theme-base/components/multimedia/_galleria.scss b/theme-base/components/multimedia/_galleria.scss
index abedc59..3fc3531 100644
--- a/theme-base/components/multimedia/_galleria.scss
+++ b/theme-base/components/multimedia/_galleria.scss
@@ -139,7 +139,7 @@
         }
 
         .p-galleria-thumbnail-item-content {
-            &:focus {
+            &:focus-visible {
                 @include focused();
             }
         }