diff --git a/src/bundle/Resources/public/scss/_tabs.scss b/src/bundle/Resources/public/scss/_tabs.scss
index d724616752..f6964b8d0e 100644
--- a/src/bundle/Resources/public/scss/_tabs.scss
+++ b/src/bundle/Resources/public/scss/_tabs.scss
@@ -122,7 +122,7 @@
             border-right-width: 0;
             background-color: $ibexa-color-light-300;
             border-color: $ibexa-color-light-300;
-            transition: all $ibexa-admin-transition-duration $ibexa-admin-transition;
+            transition: all $ibexa-admin-transition-duration $ibexa-admin-transition, margin-bottom 1ms, border-color 1ms;
         }
 
         &::after {
@@ -136,18 +136,6 @@
             transition: all $ibexa-admin-transition-duration $ibexa-admin-transition;
         }
 
-        &:hover:not([disabled]) {
-            &::before {
-                border-color: $ibexa-color-dark;
-            }
-
-            .ibexa-tabs__tab-corner {
-                .ibexa-svg-tab-corner-border {
-                    stroke: $ibexa-color-dark;
-                }
-            }
-        }
-
         &[disabled] {
             color: $ibexa-color-dark-300;
             cursor: not-allowed;
@@ -161,6 +149,7 @@
             }
         }
 
+        &:hover:not([disabled]),
         &--active {
             z-index: 4;
 
@@ -171,6 +160,7 @@
                 border-right-width: 0;
                 z-index: 2;
                 margin-bottom: -0.1px;
+                transition: all $ibexa-admin-transition-duration $ibexa-admin-transition;
             }
 
             &::after {
@@ -178,18 +168,6 @@
                 right: calculateRem(2px);
             }
 
-            &:hover:not([disabled]) {
-                &::before {
-                    border-color: $ibexa-color-light;
-                }
-
-                .ibexa-tabs__tab-corner {
-                    .ibexa-svg-tab-corner-border {
-                        stroke: $ibexa-color-light;
-                    }
-                }
-            }
-
             .ibexa-tabs__tab-corner {
                 .ibexa-svg-tab-corner-border {
                     stroke: $ibexa-color-light;
@@ -201,6 +179,20 @@
             }
         }
 
+        &:hover:not([disabled]):not(&--active) {
+            &::before {
+                border: calculateRem(1px) solid $ibexa-color-light;
+                border-right-width: 0;
+                z-index: 2;
+                transition: all $ibexa-admin-transition-duration $ibexa-admin-transition, margin-bottom 1ms, border-color 1ms;
+            }
+
+            &::after {
+                border-color: $ibexa-color-light;
+                right: 0;
+            }
+        }
+
         &--hidden {
             display: none;
         }