diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/buttons.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/buttons.less
index 5ce260f863c8..2af09c6cd39b 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/buttons.less
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/buttons.less
@@ -27,6 +27,10 @@
     &:focus {
       .btn-background(lighten(@btn-default-bg, 5%));
       .btn-border(darken(@btn-default-bg, 20%));
+      
+      // Make sure the buttons have a proper focus highlight, 
+      // despite changes from some bootstrap classes such as 'dropdown-toggle'.
+      outline: revert;
     }
   }