diff --git a/assets/stylesheets/components/_header.scss b/assets/stylesheets/components/_header.scss
index 534aa485..b6deaa93 100644
--- a/assets/stylesheets/components/_header.scss
+++ b/assets/stylesheets/components/_header.scss
@@ -113,8 +113,10 @@
 
   &:focus {
     outline: 0;
-    border-color: $inputFocusBorder;
-    box-shadow: 0 0 1px $inputFocusBorder;
+    @if $inputFocusBorder {
+      border-color: $inputFocusBorder;
+      box-shadow: 0 0 1px $inputFocusBorder;
+    }
   }
 }
 
diff --git a/assets/stylesheets/global/_base.scss b/assets/stylesheets/global/_base.scss
index dc2e9538..51cd083d 100644
--- a/assets/stylesheets/global/_base.scss
+++ b/assets/stylesheets/global/_base.scss
@@ -153,6 +153,7 @@ input {
   margin: 0;
   font-family: inherit;
   font-size: 100%;
+  color: $textColor;
   line-height: normal;
   @extend %border-box;
 }