diff --git a/x-pack/plugins/observability_solution/logs_explorer/public/components/dataset_selector/dataset_selector.tsx b/x-pack/plugins/observability_solution/logs_explorer/public/components/dataset_selector/dataset_selector.tsx
index a56bef6fb1185..b4ccd66a42cca 100644
--- a/x-pack/plugins/observability_solution/logs_explorer/public/components/dataset_selector/dataset_selector.tsx
+++ b/x-pack/plugins/observability_solution/logs_explorer/public/components/dataset_selector/dataset_selector.tsx
@@ -25,9 +25,8 @@ import {
 import { useDatasetSelector } from './state_machine/use_dataset_selector';
 import { DatasetsPopover } from './sub_components/datasets_popover';
 import { DataViewsPanelTitle } from './sub_components/data_views_panel_title';
-import { EsqlSelector } from './sub_components/esql_selector';
 import { SearchControls } from './sub_components/search_controls';
-import { SelectorActions } from './sub_components/selector_actions';
+import { ESQLButton, SelectorFooter, ShowAllLogsButton } from './sub_components/selector_footer';
 import { DatasetSelectorProps } from './types';
 import {
   buildIntegrationsTree,
@@ -216,9 +215,6 @@ export function DatasetSelector({
       onClick={togglePopover}
     >
       <Tabs>{tabEntries}</Tabs>
-      <SelectorActions>
-        <SelectorActions.ShowAllLogs isSelected={isAllMode} onClick={selectAllLogDataset} />
-      </SelectorActions>
       <EuiHorizontalRule margin="none" />
       <SearchControls
         key={panelId}
@@ -281,7 +277,11 @@ export function DatasetSelector({
         data-test-subj="dataViewsContextMenu"
         size="s"
       />
-      {isEsqlEnabled && <EsqlSelector {...discoverEsqlUrlProps} />}
+      <EuiHorizontalRule margin="none" />
+      <SelectorFooter>
+        <ShowAllLogsButton isSelected={isAllMode} onClick={selectAllLogDataset} />
+        {isEsqlEnabled && <ESQLButton {...discoverEsqlUrlProps} />}
+      </SelectorFooter>
     </DatasetsPopover>
   );
 }
diff --git a/x-pack/plugins/observability_solution/logs_explorer/public/components/dataset_selector/sub_components/esql_selector.tsx b/x-pack/plugins/observability_solution/logs_explorer/public/components/dataset_selector/sub_components/esql_selector.tsx
deleted file mode 100644
index 65ca1f1fd22e8..0000000000000
--- a/x-pack/plugins/observability_solution/logs_explorer/public/components/dataset_selector/sub_components/esql_selector.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiBadge, EuiButton, EuiHorizontalRule } from '@elastic/eui';
-import React from 'react';
-import { getRouterLinkProps } from '@kbn/router-utils';
-import { DiscoverEsqlUrlProps } from '../../../hooks/use_esql';
-import { technicalPreview, tryEsql } from '../constants';
-
-export const EsqlSelector = (props: DiscoverEsqlUrlProps) => {
-  const linkProps = getRouterLinkProps(props);
-
-  return (
-    <>
-      <EuiHorizontalRule margin="none" />
-      <EuiButton {...linkProps} color="success" size="s" fullWidth data-test-subj="esqlLink">
-        {tryEsql}
-        <EuiBadge color="hollow">{technicalPreview}</EuiBadge>
-      </EuiButton>
-    </>
-  );
-};
diff --git a/x-pack/plugins/observability_solution/logs_explorer/public/components/dataset_selector/sub_components/selector_actions.tsx b/x-pack/plugins/observability_solution/logs_explorer/public/components/dataset_selector/sub_components/selector_actions.tsx
deleted file mode 100644
index 9baa739d229f8..0000000000000
--- a/x-pack/plugins/observability_solution/logs_explorer/public/components/dataset_selector/sub_components/selector_actions.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import {
-  EuiListGroup,
-  EuiListGroupItem,
-  EuiListGroupItemProps,
-  EuiListGroupProps,
-} from '@elastic/eui';
-import { createAllLogDatasetsItem } from '../utils';
-import { showAllLogsLabel } from '../constants';
-
-type DatasetsAllActionProps = EuiListGroupProps;
-
-interface ShowAllLogsProps extends Omit<EuiListGroupItemProps, 'label'> {
-  isSelected: boolean;
-  onClick(): void;
-}
-
-export const SelectorActions = (props: DatasetsAllActionProps) => {
-  return <EuiListGroup flush size="s" {...props} />;
-};
-
-const ShowAllLogs = ({ isSelected, onClick, ...props }: ShowAllLogsProps) => {
-  const allLogs = createAllLogDatasetsItem();
-
-  return (
-    <EuiListGroupItem
-      data-test-subj={allLogs['data-test-subj']}
-      onClick={onClick}
-      iconType={isSelected ? 'check' : allLogs.iconType}
-      label={showAllLogsLabel}
-      {...props}
-    />
-  );
-};
-
-SelectorActions.Action = EuiListGroupItem;
-SelectorActions.ShowAllLogs = ShowAllLogs;
diff --git a/x-pack/plugins/observability_solution/logs_explorer/public/components/dataset_selector/sub_components/selector_footer.tsx b/x-pack/plugins/observability_solution/logs_explorer/public/components/dataset_selector/sub_components/selector_footer.tsx
new file mode 100644
index 0000000000000..b36401714a6a8
--- /dev/null
+++ b/x-pack/plugins/observability_solution/logs_explorer/public/components/dataset_selector/sub_components/selector_footer.tsx
@@ -0,0 +1,81 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import {
+  EuiBetaBadge,
+  EuiButton,
+  EuiButtonEmpty,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiListGroupProps,
+  EuiPanel,
+} from '@elastic/eui';
+import { getRouterLinkProps } from '@kbn/router-utils';
+import { DiscoverEsqlUrlProps } from '../../../hooks/use_esql';
+import { createAllLogDatasetsItem } from '../utils';
+import { showAllLogsLabel, tryEsql } from '../constants';
+
+type DatasetsAllActionProps = EuiListGroupProps;
+
+interface ShowAllLogsProps {
+  isSelected: boolean;
+  onClick(): void;
+}
+
+export const SelectorFooter = (props: DatasetsAllActionProps) => {
+  return (
+    <EuiPanel paddingSize="s" hasShadow={false} data-test-subj="datasetSelectorSearchFooter">
+      <EuiFlexGroup justifyContent="spaceBetween" alignItems="center" {...props} />
+    </EuiPanel>
+  );
+};
+
+export const ShowAllLogsButton = ({ isSelected, onClick }: ShowAllLogsProps) => {
+  const allLogs = createAllLogDatasetsItem();
+
+  return (
+    <EuiFlexItem grow={false}>
+      <EuiButtonEmpty
+        data-test-subj={allLogs['data-test-subj']}
+        onClick={onClick}
+        size="s"
+        iconType={isSelected ? 'check' : allLogs.iconType}
+        flush="left"
+      >
+        {showAllLogsLabel}
+      </EuiButtonEmpty>
+    </EuiFlexItem>
+  );
+};
+
+export const ESQLButton = (props: DiscoverEsqlUrlProps) => {
+  const linkProps = getRouterLinkProps(props);
+
+  return (
+    <EuiFlexItem grow={false}>
+      <EuiButton
+        {...linkProps}
+        iconType={() => (
+          <EuiBetaBadge
+            label="ESQL Beta"
+            color="hollow"
+            iconType="beaker"
+            size="s"
+            alignment="middle"
+          />
+        )}
+        iconSide="right"
+        color="success"
+        size="s"
+        data-test-subj="esqlLink"
+      >
+        {tryEsql}
+      </EuiButton>
+    </EuiFlexItem>
+  );
+};