diff --git a/frontend/less/espo/bootstrap/buttons.less b/frontend/less/espo/bootstrap/buttons.less
index ea1debf0c0..b16316cf12 100644
--- a/frontend/less/espo/bootstrap/buttons.less
+++ b/frontend/less/espo/bootstrap/buttons.less
@@ -78,8 +78,8 @@
   &:active {
     border-color: transparent;
   }
-  &:hover,
-  &:focus {
+  &:hover/*, Espo-fix
+  &:focus */{
     color: @link-hover-color;
     text-decoration: @link-hover-decoration;
     background-color: transparent;
diff --git a/frontend/less/espo/bootstrap/close.less b/frontend/less/espo/bootstrap/close.less
index 6d5bfe087a..a59b5efdbd 100644
--- a/frontend/less/espo/bootstrap/close.less
+++ b/frontend/less/espo/bootstrap/close.less
@@ -12,8 +12,9 @@
   text-shadow: @close-text-shadow;
   .opacity(.2);
 
-  &:hover,
-  &:focus {
+  // Espo-fix
+  &:hover/*,
+  &:focus */{
     color: @close-color;
     text-decoration: none;
     cursor: pointer;
diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index c345c8ee01..1d70c9c35a 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -3202,8 +3202,7 @@ a.close {
     color: var(--gray-soft);
 }
 
-a.close:hover,
-a.close:focus {
+a.close:hover {
     color: var(--gray-soft);
     opacity: 0.8;
 }
diff --git a/frontend/less/espo/elements/buttons.less b/frontend/less/espo/elements/buttons.less
index fad1212f91..6917559424 100644
--- a/frontend/less/espo/elements/buttons.less
+++ b/frontend/less/espo/elements/buttons.less
@@ -300,8 +300,7 @@
     }
 
     &.btn-text-hoverable {
-        &:hover,
-        &:focus {
+        &:hover {
             text-decoration: underline;
         }
     }
diff --git a/frontend/less/espo/mixins.less b/frontend/less/espo/mixins.less
index 09ee6ceb0a..d7096841aa 100644
--- a/frontend/less/espo/mixins.less
+++ b/frontend/less/espo/mixins.less
@@ -12,56 +12,56 @@
 }
 
 .button-variant-espo(@color; @background; @border; @hover-bg; @active-bg; @hover-border; @active-border) {
-  color: @color;
-  background-color: @background;
-  border-color: @border;
-
-  &:focus,
-  &.focus {
     color: @color;
     background-color: @background;
     border-color: @border;
-  }
-  &:hover {
-    color: @color;
-    background-color: @hover-bg;
-    border-color: @hover-border;
-  }
-  &:active,
-  &.active,
-  .open > .dropdown-toggle& {
-    color: @color;
-    background-color: @hover-bg;
-    border-color: @hover-border;
 
-    &:hover,
     &:focus,
     &.focus {
-      color: @color;
-      background-color: @active-bg;
-      border-color: @active-border;
+        color: @color;
+        background-color: @background;
+        border-color: @border;
     }
-  }
-  &:active,
-  &.active,
-  .open > .dropdown-toggle& {
-    background-image: none;
-  }
-  &.disabled,
-  &[disabled],
-  fieldset[disabled] & {
-    &:hover,
-    &:focus,
-    &.focus {
-      background-color: @background;
-      border-color: @border;
-    }
-  }
 
-  .badge {
-    color: @background;
-    background-color: @color;
-  }
+    &:hover {
+        color: @color;
+        background-color: @hover-bg;
+        border-color: @hover-border;
+    }
+
+    &:active,
+    &.active,
+    .open > .dropdown-toggle& {
+        color: @color;
+        background-color: @hover-bg;
+        border-color: @hover-border;
+
+        &:hover {
+            color: @color;
+            background-color: @active-bg;
+            border-color: @active-border;
+        }
+    }
+
+    &:active,
+    &.active,
+    .open > .dropdown-toggle& {
+        background-image: none;
+    }
+
+    &.disabled,
+    &[disabled],
+    fieldset[disabled] & {
+        &:hover {
+            background-color: @background;
+            border-color: @border;
+        }
+    }
+
+    .badge {
+        color: @background;
+        background-color: @color;
+    }
 }
 
 .table-row-variant-espo(@state; @background; @background-5) {