diff --git a/src/plugins/data_source_management/public/components/data_source_selectable/__snapshots__/data_source_selectable.test.tsx.snap b/src/plugins/data_source_management/public/components/data_source_selectable/__snapshots__/data_source_selectable.test.tsx.snap
index 481451f3d80a..2db6d750b6a9 100644
--- a/src/plugins/data_source_management/public/components/data_source_selectable/__snapshots__/data_source_selectable.test.tsx.snap
+++ b/src/plugins/data_source_management/public/components/data_source_selectable/__snapshots__/data_source_selectable.test.tsx.snap
@@ -45,6 +45,11 @@ exports[`DataSourceSelectable should filter options if configured 1`] = `
         aria-label="Search"
         data-test-subj="dataSourceSelectable"
         isPreFiltered={false}
+        listProps={
+          Object {
+            "onFocusBadge": false,
+          }
+        }
         onChange={[Function]}
         options={
           Array [
@@ -71,7 +76,7 @@ exports[`DataSourceSelectable should filter options if configured 1`] = `
           }
         }
         searchable={true}
-        singleSelection={true}
+        singleSelection="always"
       >
         <Component />
       </EuiSelectable>
@@ -123,6 +128,11 @@ exports[`DataSourceSelectable should render normally with local cluster is hidde
         aria-label="Search"
         data-test-subj="dataSourceSelectable"
         isPreFiltered={false}
+        listProps={
+          Object {
+            "onFocusBadge": false,
+          }
+        }
         onChange={[Function]}
         options={Array []}
         renderOption={[Function]}
@@ -133,7 +143,7 @@ exports[`DataSourceSelectable should render normally with local cluster is hidde
           }
         }
         searchable={true}
-        singleSelection={true}
+        singleSelection="always"
       >
         <Component />
       </EuiSelectable>
@@ -185,6 +195,11 @@ exports[`DataSourceSelectable should render normally with local cluster not hidd
         aria-label="Search"
         data-test-subj="dataSourceSelectable"
         isPreFiltered={false}
+        listProps={
+          Object {
+            "onFocusBadge": false,
+          }
+        }
         onChange={[Function]}
         options={Array []}
         renderOption={[Function]}
@@ -195,7 +210,7 @@ exports[`DataSourceSelectable should render normally with local cluster not hidd
           }
         }
         searchable={true}
-        singleSelection={true}
+        singleSelection="always"
       >
         <Component />
       </EuiSelectable>
diff --git a/src/plugins/data_source_management/public/components/data_source_selectable/data_source_selectable.tsx b/src/plugins/data_source_management/public/components/data_source_selectable/data_source_selectable.tsx
index c1aafb0b2a30..fdf24f0df681 100644
--- a/src/plugins/data_source_management/public/components/data_source_selectable/data_source_selectable.tsx
+++ b/src/plugins/data_source_management/public/components/data_source_selectable/data_source_selectable.tsx
@@ -286,9 +286,12 @@ export class DataSourceSelectable extends React.Component<
                 placeholder: 'Search',
                 compressed: true,
               }}
+              listProps={{
+                onFocusBadge: false,
+              }}
               options={this.state.dataSourceOptions}
               onChange={(newOptions) => this.onChange(newOptions)}
-              singleSelection={true}
+              singleSelection={'always'}
               data-test-subj={'dataSourceSelectable'}
               renderOption={(option) => (
                 <DataSourceItem