diff --git a/src/scss/_nav-sidebar.scss b/src/scss/_nav-sidebar.scss
index 4781dc157..0a1bdbe46 100644
--- a/src/scss/_nav-sidebar.scss
+++ b/src/scss/_nav-sidebar.scss
@@ -22,7 +22,8 @@
 
   .nav-link {
     position: relative;
-    width: 100%;
+    width: subtract($sidebar-width, $sidebar-padding-x * 2);
+    @include transition(width $transition-fn $transition-speed);
 
     p {
       display: inline;
diff --git a/src/scss/_sidebar-collapse.scss b/src/scss/_sidebar-collapse.scss
index 2fb1dd696..b0f236622 100644
--- a/src/scss/_sidebar-collapse.scss
+++ b/src/scss/_sidebar-collapse.scss
@@ -20,6 +20,12 @@
     display: none;
   }
 
+  .nav-sidebar {
+    .nav-link {
+      width: $sidebar-mini-width - $sidebar-padding-x * 2;
+    }
+  }
+
   .nav-sidebar .nav-link p {
     width: 0;
     white-space: nowrap;
@@ -44,6 +50,10 @@
       display: inline-block;
     }
 
+    .nav-sidebar .nav-link {
+      width: subtract($sidebar-width, $sidebar-padding-x * 2);
+    }
+
     .nav-sidebar .nav-link p,
     .brand-link {
       margin-left: 0;