diff --git a/site/src/App.scss b/site/src/App.scss
index a03eb42c..5c2ad85a 100644
--- a/site/src/App.scss
+++ b/site/src/App.scss
@@ -137,7 +137,7 @@ button {
   background-position: 50%;
   background-repeat: no-repeat;
   background-size: contain;
-  border: 1px solid #8888;
+  border: 1px solid var(--overlay3);
   border-radius: 0.25rem;
   width: 1em;
   height: 1em;
diff --git a/site/src/style/theme.scss b/site/src/style/theme.scss
index c822925d..def312fa 100644
--- a/site/src/style/theme.scss
+++ b/site/src/style/theme.scss
@@ -55,6 +55,10 @@
     border-color: var(--overlay3);
   }
 
+  .form-control:focus {
+    border-color: #86bbfb !important;
+  }
+
   .custom-control-label::before {
     background-color: var(--overlay3);
   }