diff --git a/oas_docs/output/kibana.serverless.yaml b/oas_docs/output/kibana.serverless.yaml
index 32d38c3569148..9f0c38baded7d 100644
--- a/oas_docs/output/kibana.serverless.yaml
+++ b/oas_docs/output/kibana.serverless.yaml
@@ -16693,14 +16693,10 @@ paths:
                       type: object
                       properties:
                         active:
-                          description: >-
-                            When false, the enrollment API key is revoked and
-                            cannot be used for enrolling Elastic Agents.
+                          description: When false, the enrollment API key is revoked and cannot be used for enrolling Elastic Agents.
                           type: boolean
                         api_key:
-                          description: >-
-                            The enrollment API key (token) used for enrolling
-                            Elastic Agents.
+                          description: The enrollment API key (token) used for enrolling Elastic Agents.
                           type: string
                         api_key_id:
                           description: The ID of the API key in the Security API.
@@ -16713,9 +16709,7 @@ paths:
                           description: The name of the enrollment API key.
                           type: string
                         policy_id:
-                          description: >-
-                            The ID of the agent policy the Elastic Agent will be
-                            enrolled in.
+                          description: The ID of the agent policy the Elastic Agent will be enrolled in.
                           type: string
                       required:
                         - id
diff --git a/oas_docs/output/kibana.yaml b/oas_docs/output/kibana.yaml
index 8a3d4d3634b8d..50fd92fdc8a9c 100644
--- a/oas_docs/output/kibana.yaml
+++ b/oas_docs/output/kibana.yaml
@@ -19477,14 +19477,10 @@ paths:
                       type: object
                       properties:
                         active:
-                          description: >-
-                            When false, the enrollment API key is revoked and
-                            cannot be used for enrolling Elastic Agents.
+                          description: When false, the enrollment API key is revoked and cannot be used for enrolling Elastic Agents.
                           type: boolean
                         api_key:
-                          description: >-
-                            The enrollment API key (token) used for enrolling
-                            Elastic Agents.
+                          description: The enrollment API key (token) used for enrolling Elastic Agents.
                           type: string
                         api_key_id:
                           description: The ID of the API key in the Security API.
@@ -19497,9 +19493,7 @@ paths:
                           description: The name of the enrollment API key.
                           type: string
                         policy_id:
-                          description: >-
-                            The ID of the agent policy the Elastic Agent will be
-                            enrolled in.
+                          description: The ID of the agent policy the Elastic Agent will be enrolled in.
                           type: string
                       required:
                         - id
diff --git a/src/plugins/unified_search/public/dataview_picker/change_dataview.styles.ts b/src/plugins/unified_search/public/dataview_picker/change_dataview.styles.ts
index 9727c8f6e1593..21ece7f82e88d 100644
--- a/src/plugins/unified_search/public/dataview_picker/change_dataview.styles.ts
+++ b/src/plugins/unified_search/public/dataview_picker/change_dataview.styles.ts
@@ -12,15 +12,18 @@ import { calculateWidthFromEntries } from '@kbn/calculate-width-from-char-count'
 import { DataViewListItemEnhanced } from './dataview_list';
 
 const MIN_WIDTH = 300;
+const MAX_MOBILE_WIDTH = 350;
 
 export const changeDataViewStyles = ({
   fullWidth,
   dataViewsList,
   theme,
+  isMobile,
 }: {
   fullWidth?: boolean;
   dataViewsList: DataViewListItemEnhanced[];
   theme: EuiThemeComputed;
+  isMobile: boolean;
 }) => {
   return {
     trigger: {
@@ -30,7 +33,10 @@ export const changeDataViewStyles = ({
       borderBottomLeftRadius: 0,
     },
     popoverContent: {
-      width: calculateWidthFromEntries(dataViewsList, ['name', 'id'], { minWidth: MIN_WIDTH }),
+      width: calculateWidthFromEntries(dataViewsList, ['name', 'id'], {
+        minWidth: MIN_WIDTH,
+        ...(isMobile && { maxWidth: MAX_MOBILE_WIDTH }),
+      }),
     },
   };
 };
diff --git a/src/plugins/unified_search/public/dataview_picker/change_dataview.tsx b/src/plugins/unified_search/public/dataview_picker/change_dataview.tsx
index d89621d598679..06ed558ce7a01 100644
--- a/src/plugins/unified_search/public/dataview_picker/change_dataview.tsx
+++ b/src/plugins/unified_search/public/dataview_picker/change_dataview.tsx
@@ -17,6 +17,7 @@ import {
   EuiContextMenuItem,
   useEuiTheme,
   useGeneratedHtmlId,
+  useIsWithinBreakpoints,
   EuiIcon,
   EuiText,
   EuiContextMenuPanelProps,
@@ -68,10 +69,13 @@ export function ChangeDataView({
   const kibana = useKibana<IUnifiedSearchPluginServices>();
   const { application, data, dataViews, dataViewEditor } = kibana.services;
 
+  const isMobile = useIsWithinBreakpoints(['xs']);
+
   const styles = changeDataViewStyles({
     fullWidth: trigger.fullWidth,
     dataViewsList,
     theme: euiTheme,
+    isMobile,
   });
 
   // Create a reusable id to ensure search input is the first focused item in the popover even though it's not the first item
diff --git a/test/functional/screenshots/.empty b/test/functional/screenshots/.empty
deleted file mode 100644
index e69de29bb2d1d..0000000000000