diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbcc7f0a9c96..a586aec975f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -113,6 +113,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- [Workspace] Add base path when parse url in http service ([#6233](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6233))
- [Multiple Datasource] Fix sslConfig for multiple datasource to handle when certificateAuthorities is unset ([#6282](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6282))
- [BUG][Multiple Datasource]Fix bug in data source aggregated view to change it to depend on displayAllCompatibleDataSources property to show the badge value ([#6291](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6291))
+- [BUG][Multiple Datasource] Fix style of data source option inside popover for data source selector, selectable, multi select components ([#6438](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6438))
- [BUG][Multiple Datasource]Read hideLocalCluster setting from yml and set in data source selector and data source menu ([#6361](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6361))
- [BUG] Fix for checkForFunctionProperty so that order does not matter ([#6248](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6248))
diff --git a/src/plugins/data_source_management/public/components/data_source_option.test.tsx b/src/plugins/data_source_management/public/components/data_source_item/data_source_item.test.tsx
similarity index 74%
rename from src/plugins/data_source_management/public/components/data_source_option.test.tsx
rename to src/plugins/data_source_management/public/components/data_source_item/data_source_item.test.tsx
index 7d6375f47d29..8cb736f2fb61 100644
--- a/src/plugins/data_source_management/public/components/data_source_option.test.tsx
+++ b/src/plugins/data_source_management/public/components/data_source_item/data_source_item.test.tsx
@@ -6,12 +6,12 @@
import { shallow } from 'enzyme';
import React from 'react';
import { EuiBadge, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { DataSourceOptionItem } from './data_source_option';
-import { SelectedDataSourceOption } from './data_source_multi_selectable/data_source_filter_group';
+import { DataSourceItem } from '.';
+import { DataSourceOption } from '../data_source_menu/types';
describe('Test on ShowDataSourceOption', () => {
it('should render the component with label', () => {
- const item: SelectedDataSourceOption = {
+ const item: DataSourceOption = {
id: '1',
label: 'DataSource 1',
visible: true,
@@ -19,7 +19,7 @@ describe('Test on ShowDataSourceOption', () => {
const defaultDataSource = null;
const component = shallow(
-