diff --git a/src/plugins/data/public/ui/dataset_selector/_dataset_explorer.scss b/src/plugins/data/public/ui/dataset_selector/_dataset_explorer.scss
index b75f0f8b9ff2..0011db04fa29 100644
--- a/src/plugins/data/public/ui/dataset_selector/_dataset_explorer.scss
+++ b/src/plugins/data/public/ui/dataset_selector/_dataset_explorer.scss
@@ -26,7 +26,3 @@
     border-bottom: $euiBorderThin;
   }
 }
-
-.datasetSelector__selectable {
-  padding: $euiSizeXS;
-}
diff --git a/src/plugins/data/public/ui/dataset_selector/_dataset_selector.scss b/src/plugins/data/public/ui/dataset_selector/_dataset_selector.scss
new file mode 100644
index 000000000000..179bb8cf7917
--- /dev/null
+++ b/src/plugins/data/public/ui/dataset_selector/_dataset_selector.scss
@@ -0,0 +1,10 @@
+.datasetSelector {
+  &__icon {
+    margin-right: 4px;
+  }
+
+  &__selectable {
+    width: 365px;
+    padding: $euiSizeXS;
+  }
+}
diff --git a/src/plugins/data/public/ui/dataset_selector/_index.scss b/src/plugins/data/public/ui/dataset_selector/_index.scss
index 8057fc32b961..b1d4dbe34c68 100644
--- a/src/plugins/data/public/ui/dataset_selector/_index.scss
+++ b/src/plugins/data/public/ui/dataset_selector/_index.scss
@@ -1 +1,2 @@
 @import "./dataset_explorer";
+@import "./dataset_selector";
diff --git a/src/plugins/data/public/ui/dataset_selector/dataset_selector.tsx b/src/plugins/data/public/ui/dataset_selector/dataset_selector.tsx
index aa34ea12df52..5614a8ec48b3 100644
--- a/src/plugins/data/public/ui/dataset_selector/dataset_selector.tsx
+++ b/src/plugins/data/public/ui/dataset_selector/dataset_selector.tsx
@@ -110,7 +110,7 @@ export const DatasetSelector = ({
             iconSide="right"
             onClick={togglePopover}
           >
-            <EuiIcon type={datasetIcon} className="dataSetNavigator__icon" />
+            <EuiIcon type={datasetIcon} className="datasetSelector__icon" />
             {selectedDataset?.title ?? 'Select data'}
           </EuiButtonEmpty>
         </EuiToolTip>
diff --git a/src/plugins/data/public/ui/mocks.ts b/src/plugins/data/public/ui/mocks.ts
index dc70e5cac1d4..bbb3a118b9a9 100644
--- a/src/plugins/data/public/ui/mocks.ts
+++ b/src/plugins/data/public/ui/mocks.ts
@@ -38,7 +38,6 @@ function createStartContract(
   const queryEnhancements = new Map();
   return {
     IndexPatternSelect: jest.fn(),
-    DataSetNavigator: jest.fn(), // Add the missing property
     SearchBar: jest.fn(),
     SuggestionsComponent: jest.fn(), // Add the missing property
     Settings: new SettingsMock(
diff --git a/src/plugins/data/public/ui/query_editor/_query_editor.scss b/src/plugins/data/public/ui/query_editor/_query_editor.scss
index 88ba526abcd5..8b0300497121 100644
--- a/src/plugins/data/public/ui/query_editor/_query_editor.scss
+++ b/src/plugins/data/public/ui/query_editor/_query_editor.scss
@@ -102,7 +102,7 @@
   }
 }
 
-.osdQueryEditor__dataSetNavigatorWrapper {
+.osdQueryEditor__datasetSelectorWrapper {
   :first-child {
     border-bottom: $euiBorderThin !important;
   }