diff --git a/app/react/components/form-components/ReactSelect.css b/app/react/components/form-components/ReactSelect.css
index 29b4b94b2..0f64114df 100644
--- a/app/react/components/form-components/ReactSelect.css
+++ b/app/react/components/form-components/ReactSelect.css
@@ -96,7 +96,7 @@
border-bottom-left-radius: 0;
}
-.input-group .portainer-selector-root .portainer-selector__control:not(:last-child) {
+.input-group .portainer-selector-root .portainer-selector__control:not(:last-child, .portainer-selector__control--menu-is-open) {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
diff --git a/app/react/components/form-components/ReactSelect.tsx b/app/react/components/form-components/ReactSelect.tsx
index 8b12edbb5..3ec4429b9 100644
--- a/app/react/components/form-components/ReactSelect.tsx
+++ b/app/react/components/form-components/ReactSelect.tsx
@@ -1,12 +1,16 @@
import ReactSelectCreatable, {
CreatableProps as ReactSelectCreatableProps,
} from 'react-select/creatable';
+import ReactSelectAsync, {
+ AsyncProps as ReactSelectAsyncProps,
+} from 'react-select/async';
import ReactSelect, {
GroupBase,
+ OptionsOrGroups,
Props as ReactSelectProps,
} from 'react-select';
import clsx from 'clsx';
-import { RefAttributes } from 'react';
+import { RefAttributes, useMemo } from 'react';
import ReactSelectType from 'react-select/dist/declarations/src/Select';
import './ReactSelect.css';
@@ -56,9 +60,24 @@ export function Select<
className,
isCreatable = false,
size = 'md',
+
...props
-}: Props