diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
index 1ab4561..14fa8f9 100644
--- a/client/dist/styles/bundle.css
+++ b/client/dist/styles/bundle.css
@@ -1 +1 @@
-.ss-tag-field__multi-value{margin-top:3px;color:#43536d;background-color:#fff;border:1px solid #66afe9;border-radius:.23rem}.ss-tag-field__multi-value__remove{font-size:1.231rem;padding:0 5px 2px;border-left:1px solid #66afe9;border-radius:0}.ss-tag-field__multi-value__remove:focus,.ss-tag-field__multi-value__remove:hover{background-color:rgba(0,113,230,.08);color:#0071e6}.ss-tag-field__control{border-color:rgb(206.0738636364,213.2556818182,224.9261363636);box-shadow:none}.ss-tag-field__control--is-focused{border-color:#29abe2;box-shadow:none}.ss-tag-field__option+.ss-tag-field__option{border-top:1px solid rgb(218.7079545455,224.0352272727,232.6920454545)}.ss-tag-field__option-button{border:1px solid rgb(218.7079545455,224.0352272727,232.6920454545);border-radius:.23rem;background:#fff;width:auto !important;max-width:25%;margin:-4px -5px -4px 5px;padding:4px 5px 4px 4px;cursor:pointer}.ss-tag-field__option-button:hover{background:rgb(206.0738636364,213.2556818182,224.9261363636)}.ss-tag-field__option-button .font-icon-right-open-big{margin:2px 0 0 -1px;width:24px}.ss-tag-field__option-count-icon{padding:0 .6154rem;line-height:.8}.ss-tag-field__option-context{color:rgb(86.4147727273,107.0511363636,140.5852272727);font-size:.923rem}.ss-tag-field__option--is-focused{background-color:#f5f5f5}.ss-tag-field__option--is-selected{background:#0071c4;color:#fff}.ss-tag-field__option--is-selected .ss-tag-field__option-button{border-color:#29abe2;background:none;color:#fff}.ss-tag-field__option--is-selected .ss-tag-field__option-button:hover{background:rgba(0,0,0,.2)}.ss-tag-field__option-title--highlighted{font-weight:bold}.ss-tag-field__indicator{cursor:pointer}.ss-tag-field__clear-indicator:hover,.ss-tag-field__clear-indicator:focus{color:#d40404}.ss-tag-field__dropdown-indicator:hover,.ss-tag-field__dropdown-indicator:focus{color:rgb(47.5852272727,58.9488636364,77.4147727273)}.ss-tag-field__menu{z-index:10}
+.ss-tag-field__multi-value{margin-top:3px;color:#43536d;background-color:#fff;border:1px solid #66afe9;border-radius:.23rem}.ss-tag-field__multi-value__remove{font-size:1.231rem;padding:0 5px 2px;border-left:1px solid #66afe9;border-radius:0}.ss-tag-field__multi-value__remove:focus,.ss-tag-field__multi-value__remove:hover{background-color:rgba(0,113,230,.08);color:#0071e6}.ss-tag-field__control{border-color:rgb(206.0738636364,213.2556818182,224.9261363636);box-shadow:none}.ss-tag-field__control--is-focused{border-color:rgba(0,0,0,0);box-shadow:none;outline-offset:var(--focus-outline-offset);outline:var(--focus-outline-width) var(--focus-outline-style) var(--focus-outline-color) !important}.ss-tag-field__control--is-focused:hover{border-color:rgba(0,0,0,0)}.ss-tag-field__option+.ss-tag-field__option{border-top:1px solid rgb(218.7079545455,224.0352272727,232.6920454545)}.ss-tag-field__option-button{border:1px solid rgb(218.7079545455,224.0352272727,232.6920454545);border-radius:.23rem;background:#fff;width:auto !important;max-width:25%;margin:-4px -5px -4px 5px;padding:4px 5px 4px 4px;cursor:pointer}.ss-tag-field__option-button:hover{background:rgb(206.0738636364,213.2556818182,224.9261363636)}.ss-tag-field__option-button .font-icon-right-open-big{margin:2px 0 0 -1px;width:24px}.ss-tag-field__option-count-icon{padding:0 .6154rem;line-height:.8}.ss-tag-field__option-context{color:rgb(86.4147727273,107.0511363636,140.5852272727);font-size:.923rem}.ss-tag-field__option--is-focused{background-color:#f5f5f5}.ss-tag-field__option--is-selected{background:#0071c4;color:#fff}.ss-tag-field__option--is-selected .ss-tag-field__option-button{border-color:#29abe2;background:none;color:#fff}.ss-tag-field__option--is-selected .ss-tag-field__option-button:hover{background:rgba(0,0,0,.2)}.ss-tag-field__option-title--highlighted{font-weight:bold}.ss-tag-field__indicator{cursor:pointer}.ss-tag-field__clear-indicator:hover,.ss-tag-field__clear-indicator:focus{color:#d40404}.ss-tag-field__dropdown-indicator:hover,.ss-tag-field__dropdown-indicator:focus{color:rgb(47.5852272727,58.9488636364,77.4147727273)}.ss-tag-field__menu{z-index:10}
diff --git a/client/src/components/TagField.scss b/client/src/components/TagField.scss
index 598afc0..9d37447 100644
--- a/client/src/components/TagField.scss
+++ b/client/src/components/TagField.scss
@@ -26,8 +26,16 @@
 }
 
 .ss-tag-field__control--is-focused {
-  border-color: $brand-primary;
+  border-color: transparent;
   box-shadow: none;
+  outline-offset: var(--focus-outline-offset);
+  // We have to use !important here to override react-select styles, which also use !important
+  outline: var(--focus-outline-width) var(--focus-outline-style) var(--focus-outline-color) !important;
+
+  // this is required to override default react-select style
+  &:hover {
+    border-color: transparent;
+  }
 }
 
 .ss-tag-field__option+.ss-tag-field__option {