diff --git a/app/assets/stylesheets/application.sass b/app/assets/stylesheets/application.sass
index bf1d19b10..3a4b95ddb 100644
--- a/app/assets/stylesheets/application.sass
+++ b/app/assets/stylesheets/application.sass
@@ -25,6 +25,7 @@
 @import general/table
 @import forms/forms
 @import forms/confirmation
+@import forms/autocomplete
 
 @import general/theming-editor
 
diff --git a/app/assets/stylesheets/forms/_autocomplete.sass b/app/assets/stylesheets/forms/_autocomplete.sass
new file mode 100644
index 000000000..05e044650
--- /dev/null
+++ b/app/assets/stylesheets/forms/_autocomplete.sass
@@ -0,0 +1,24 @@
+
+// jquery ui override
+.ui-autocomplete
+  @include css4
+    background: var(--input--background--focus)
+    border: 1px solid var(--input--border-color--focus)
+    color: var(--input--text--focus)
+  list-style: none
+  padding: 0
+  .ui-menu-item div
+    padding: 2px 5px
+    display: block
+    cursor: pointer
+    overflow: hidden
+    text-overflow: ellipsis
+    white-space: nowrap
+    &:hover
+      @include css4
+        background: var(--primary)
+      @include css4
+        color: var(--white)
+// needed for ellipsis in text to work and acts as a min-width
+.ui-menu
+  width: 50px
diff --git a/app/assets/stylesheets/forms/_forms.sass b/app/assets/stylesheets/forms/_forms.sass
index 8faf5bf00..f3f635423 100644
--- a/app/assets/stylesheets/forms/_forms.sass
+++ b/app/assets/stylesheets/forms/_forms.sass
@@ -258,30 +258,6 @@ input[type=submit]
   margin-bottom: 3px
 
 
-// jquery ui override
-.ui-autocomplete
-  @include css4
-    background: var(--input--background--focus)
-    border: 1px solid var(--input--border-color--focus)
-    color: var(--input--text--focus)
-  list-style: none
-  padding: 0
-  .ui-menu-item div
-    padding: 2px 5px
-    display: block
-    cursor: pointer
-    overflow: hidden
-    text-overflow: ellipsis
-    white-space: nowrap
-    &:hover
-      @include css4
-        background: var(--primary)
-      @include css4
-        color: var(--white)
-// needed for ellipsis in text to work and acts as a min-width
-.ui-menu
-  width: 50px
-
 // form wizard
 .wizard-stage
   display: none
diff --git a/app/assets/stylesheets/manage.sass b/app/assets/stylesheets/manage.sass
index e08c1596e..087c35ffa 100644
--- a/app/assets/stylesheets/manage.sass
+++ b/app/assets/stylesheets/manage.sass
@@ -3,6 +3,9 @@
 @import manage/selectize-fix
 @import vendor/simplemde.min
 @import vendor/codemirror
+@import general/variables
+@import general/css4
+@import manage/autocomplete
 
 $grey-dark: #555
 $grey-med: #999
@@ -172,6 +175,7 @@ $grey-med: #999
 .sidebar-mobile .sidebar-sticky
   height: auto
 
+
 /*
  * Datatable changes
  */
diff --git a/app/assets/stylesheets/manage/_autocomplete.sass b/app/assets/stylesheets/manage/_autocomplete.sass
new file mode 100644
index 000000000..f5e716fea
--- /dev/null
+++ b/app/assets/stylesheets/manage/_autocomplete.sass
@@ -0,0 +1,12 @@
+
+@import ../forms/autocomplete
+
+// jquery ui override
+.ui-autocomplete
+  background: white
+  border: 1px solid #333
+  color: #222
+  .ui-menu-item div
+    &:hover
+      background: #999
+      color: white