diff --git a/app/assets/stylesheets/content/_autocomplete.sass b/app/assets/stylesheets/content/_autocomplete.sass
index 30146a8f1d..105466c420 100644
--- a/app/assets/stylesheets/content/_autocomplete.sass
+++ b/app/assets/stylesheets/content/_autocomplete.sass
@@ -167,7 +167,7 @@ mark.ui-autocomplete-match
   .ng-value
     @include text-shortener
 
-.textarea-wrapper .ng-select .ng-select-container
+.ng-select.-multi-select .ng-select-container
   height: initial !important
   min-height: initial !important
 
diff --git a/frontend/src/app/components/filters/filter-toggled-multiselect-value/filter-toggled-multiselect-value.component.html b/frontend/src/app/components/filters/filter-toggled-multiselect-value/filter-toggled-multiselect-value.component.html
index b6e237c3ee..3c52dd4bd3 100644
--- a/frontend/src/app/components/filters/filter-toggled-multiselect-value/filter-toggled-multiselect-value.component.html
+++ b/frontend/src/app/components/filters/filter-toggled-multiselect-value/filter-toggled-multiselect-value.component.html
@@ -5,7 +5,7 @@
              [compareWith]="compareByHrefOrString"
              [clearSearchOnAdd]="true"
              [placeholder]="text.placeholder"
-             class="advanced-filters--ng-select"
+             class="advanced-filters--ng-select -multi-select"
              [id]="'values-' + filter.id"
              [items]="availableOptions"
              [multiple]="true"
diff --git a/frontend/src/app/modules/fields/edit/field-types/multi-select-edit-field.component.html b/frontend/src/app/modules/fields/edit/field-types/multi-select-edit-field.component.html
index 596cd41064..dcd68691e3 100644
--- a/frontend/src/app/modules/fields/edit/field-types/multi-select-edit-field.component.html
+++ b/frontend/src/app/modules/fields/edit/field-types/multi-select-edit-field.component.html
@@ -1,6 +1,6 @@
 <div class="textarea-wrapper">
   <ng-select [(ngModel)]="selectedOption"
-             [ngClass]="'wp-inline-edit--field'"
+             [ngClass]="'wp-inline-edit--field -multi-select'"
              [required]="required"
              [clearable]="!required"
              [disabled]="inFlight"