diff --git a/app/assets/stylesheets/common/base/combobox.scss b/app/assets/stylesheets/common/base/combobox.scss
index 2aaf0fa7e1f..5c743b34e07 100644
--- a/app/assets/stylesheets/common/base/combobox.scss
+++ b/app/assets/stylesheets/common/base/combobox.scss
@@ -29,8 +29,17 @@
 
 .select2-container {
   border-radius: 3px;
+  border: 1px solid scale-color-diff();
+  &.select2-dropdown-open {
+    border: 0;
+  }
+  &.select2-container-active {
+    border-color: $tertiary;
+  }
 }
 
+
+
 .select2-container a.select2-choice {
   background: $secondary;
   border-radius: 3px;
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index ca0af4639d0..0a0fc25a5a5 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -218,7 +218,7 @@
       display: inline-block;
       .select2-container {
         width: 400px;
-        margin-top: 6px;
+        margin-top: 5px;
         a {
           padding-top: 4px;
           height: 28px;