diff --git a/assets/scss/_sidebar-toc.scss b/assets/scss/_sidebar-toc.scss
index 249ec25f39..693bfb6d8f 100644
--- a/assets/scss/_sidebar-toc.scss
+++ b/assets/scss/_sidebar-toc.scss
@@ -50,7 +50,6 @@
 
       &:hover {
         color: $blue;
-        text-decoration: none;
       }
     }
   }
@@ -59,3 +58,16 @@
     padding-left: 0;
   }
 }
+
+.td-page-meta,
+.td-sidebar-toc,
+.td-toc {
+  a {
+    text-decoration: none;
+
+    &:hover,
+    &:focus {
+      text-decoration: underline;
+    }
+  }
+}
\ No newline at end of file
diff --git a/assets/scss/_sidebar-tree.scss b/assets/scss/_sidebar-tree.scss
index 50beb4e119..1cdde0d493 100644
--- a/assets/scss/_sidebar-tree.scss
+++ b/assets/scss/_sidebar-tree.scss
@@ -63,6 +63,7 @@
 
     a {
       color: $gray-900;
+      text-decoration: none;
     }
   }
 
@@ -77,9 +78,10 @@
   }
 
   a {
-    &:hover {
+    &:hover,
+    &:focus {
       color: $blue;
-      text-decoration: none;
+      text-decoration: underline;
     }
 
     &.active {
diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss
index 5fdd86c76e..496b31cc44 100644
--- a/assets/scss/_variables.scss
+++ b/assets/scss/_variables.scss
@@ -35,7 +35,7 @@ $td-box-colors: $dark, $primary, $secondary, $info, $white, $gray-600, $success,
   $warning, $dark, $danger, $primary, $secondary, $info !default;
 
 $link-color: $blue-500 !default;
-$link-decoration: none !default;
+$link-decoration: underline !default;
 $link-shade-percentage: 30% !default;
 
 // Fonts