diff --git a/nav.css b/nav.css
index 1566a9c..94d3546 100644
--- a/nav.css
+++ b/nav.css
@@ -103,10 +103,7 @@ label[for="nav-trigger"] {
   margin-top: 5px;
   display: block;
   background: #fff;
-  border: 1px solid #b7b7b7;
-  -moz-box-shadow: inset 0px 1px 0px 0px #fff;
-  -webkit-box-shadow: inset 0px 1px 0px 0px #fff;
-  box-shadow: inset 0px 1px 0px 0px #fff; }
+  border: 1px solid #b7b7b7; }
   .nav-top > li {
     -moz-box-shadow: inset 0px 1px 0px 0px #fff;
     -webkit-box-shadow: inset 0px 1px 0px 0px #fff;
@@ -124,8 +121,15 @@ label[for="nav-trigger"] {
     position: relative;
     cursor: pointer; }
     .nav-top li:hover {
+      -moz-box-shadow: inset 0px 1px 0px 0px #FFC06E;
+      -webkit-box-shadow: inset 0px 1px 0px 0px #FFC06E;
+      box-shadow: inset 0px 1px 0px 0px #FFC06E;
       background: #FBA026;
       color: #252525; }
+      .nav-top li:hover:first-child {
+        -moz-box-shadow: inset 1px 1px 0px 0px #FFC06E;
+        -webkit-box-shadow: inset 1px 1px 0px 0px #FFC06E;
+        box-shadow: inset 1px 1px 0px 0px #FFC06E; }
       .nav-top li:hover > ul {
         display: block;
         opacity: 1;
diff --git a/nav.scss b/nav.scss
index c4dc4cb..a9be4fd 100644
--- a/nav.scss
+++ b/nav.scss
@@ -143,8 +143,6 @@ label[for="nav-trigger"] {
     background: #fff;
     border: 1px solid $content-border-color;
 
-    @include box-shadow-top(#fff);
-
     > li {
         @include box-shadow-top(#fff);
 
@@ -165,6 +163,12 @@ label[for="nav-trigger"] {
         cursor: pointer;
 
         &:hover {
+            @include box-shadow-top(#FFC06E);
+
+            &:first-child {
+                @include box-shadow-out(#FFC06E);
+            }
+
             background: $default-highlighter;
             color: #252525;
 
diff --git a/styles.css b/styles.css
index a88f2d4..3880c6f 100644
--- a/styles.css
+++ b/styles.css
@@ -4458,10 +4458,7 @@ label[for="nav-trigger"] {
   margin-top: 5px;
   display: block;
   background: #fff;
-  border: 1px solid #b7b7b7;
-  -moz-box-shadow: inset 0px 1px 0px 0px #fff;
-  -webkit-box-shadow: inset 0px 1px 0px 0px #fff;
-  box-shadow: inset 0px 1px 0px 0px #fff; }
+  border: 1px solid #b7b7b7; }
   .nav-top > li {
     -moz-box-shadow: inset 0px 1px 0px 0px #fff;
     -webkit-box-shadow: inset 0px 1px 0px 0px #fff;
@@ -4479,8 +4476,15 @@ label[for="nav-trigger"] {
     position: relative;
     cursor: pointer; }
     .nav-top li:hover {
+      -moz-box-shadow: inset 0px 1px 0px 0px #FFC06E;
+      -webkit-box-shadow: inset 0px 1px 0px 0px #FFC06E;
+      box-shadow: inset 0px 1px 0px 0px #FFC06E;
       background: #FBA026;
       color: #252525; }
+      .nav-top li:hover:first-child {
+        -moz-box-shadow: inset 1px 1px 0px 0px #FFC06E;
+        -webkit-box-shadow: inset 1px 1px 0px 0px #FFC06E;
+        box-shadow: inset 1px 1px 0px 0px #FFC06E; }
       .nav-top li:hover > ul {
         display: block;
         opacity: 1;
@@ -4932,7 +4936,8 @@ section > h2 {
     border-top: 1px solid #b7b7b7; }
 
 .tab-2 .tab-links label {
-  padding: 5px 10px 5px 10px; }
+  padding: 5px 10px 5px 10px;
+  border: 1px solid transparent; }
 .tab-2 .tab-links li {
   margin: 0 5px 15px 0; }
 .tab-2 .tab-links .active a, .tab-2 .tab-links .active label {
diff --git a/tab.css b/tab.css
index de1e9b9..a062ecc 100644
--- a/tab.css
+++ b/tab.css
@@ -77,7 +77,8 @@
     border-top: 1px solid #b7b7b7; }
 
 .tab-2 .tab-links label {
-  padding: 5px 10px 5px 10px; }
+  padding: 5px 10px 5px 10px;
+  border: 1px solid transparent; }
 .tab-2 .tab-links li {
   margin: 0 5px 15px 0; }
 .tab-2 .tab-links .active a, .tab-2 .tab-links .active label {
diff --git a/tab.scss b/tab.scss
index 86cd1e4..777329c 100644
--- a/tab.scss
+++ b/tab.scss
@@ -103,6 +103,7 @@
     .tab-links {
         label {
             padding: 5px 10px 5px 10px;
+            border: 1px solid transparent; // fixes jumping text for active and non-active labels
         }
 
         li {