diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index 783b9cb6cf..e742656199 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -216,14 +216,19 @@
   background-color: transparent; // For `<button>`s
   border: 0; // For `<button>`s
 
-  &:hover,
-  &:focus {
+  &:hover {
     color: var(--#{$prefix}dropdown-link-hover-color);
     text-decoration: if($link-hover-decoration == underline, none, null);
     outline-color: var(--#{$prefix}dropdown-link-hover-bg); // Boosted mod
     @include gradient-bg(var(--#{$prefix}dropdown-link-hover-bg));
   }
 
+  &:focus {
+    &[data-focus-visible-added] {
+      @include focus-visible();
+    }
+  }
+
   &.active,
   &:active {
     color: var(--#{$prefix}dropdown-link-active-color);
diff --git a/scss/_nav.scss b/scss/_nav.scss
index bd234ce20e..dbaab3fee1 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -30,7 +30,6 @@
   color: var(--#{$prefix}nav-link-color);
   text-decoration: if($link-decoration == none, null, none);
   background: none; // Boosted mod: Prevent dropdown's background to interfere
-  @include transition($nav-link-transition);
 
   &:hover {
     color: var(--#{$prefix}nav-link-hover-color);
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index afc2213879..507410712c 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -185,10 +185,8 @@
     margin-left: calc(var(--#{$prefix}navbar-nav-link-padding-x) * -1); /* stylelint-disable-line function-disallowed-list */
     word-break: break-all;
     outline-offset: $spacer;
-    @include transition($navbar-transition);
 
-    &:hover,
-    &:focus {
+    &:hover {
       z-index: 1;
       outline-offset: 0;
     }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 5775f4d07e..1e023b42b7 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1199,7 +1199,6 @@ $nav-link-font-size:                null !default;
 $nav-link-font-weight:              $font-weight-bold !default;
 $nav-link-color:                    var(--#{$prefix}link-color) !default;
 $nav-link-hover-color:              var(--#{$prefix}link-hover-color) !default;
-$nav-link-transition:               null !default;
 $nav-link-disabled-color:           $gray-500 !default;
 
 $nav-tabs-border-color:             $black !default;