diff --git a/public/app/core/components/NestedFolderPicker/NestedFolderList.tsx b/public/app/core/components/NestedFolderPicker/NestedFolderList.tsx
index 8e83126abfc..9617668e356 100644
--- a/public/app/core/components/NestedFolderPicker/NestedFolderList.tsx
+++ b/public/app/core/components/NestedFolderPicker/NestedFolderList.tsx
@@ -6,6 +6,7 @@ import { GrafanaTheme2 } from '@grafana/data';
 import { IconButton, useStyles2 } from '@grafana/ui';
 import { getSvgSize } from '@grafana/ui/src/components/Icon/utils';
 import { Text } from '@grafana/ui/src/components/Text/Text';
+import { Trans } from 'app/core/internationalization';
 import { Indent } from 'app/features/browse-dashboards/components/Indent';
 import { DashboardsTreeItem } from 'app/features/browse-dashboards/types';
 import { DashboardViewItem } from 'app/features/search/types';
@@ -39,15 +40,21 @@ export function NestedFolderList({
 
   return (
     <div className={styles.table}>
-      <List
-        height={ROW_HEIGHT * Math.min(6.5, items.length)}
-        width="100%"
-        itemData={virtualData}
-        itemSize={ROW_HEIGHT}
-        itemCount={items.length}
-      >
-        {Row}
-      </List>
+      {items.length > 0 ? (
+        <List
+          height={ROW_HEIGHT * Math.min(6.5, items.length)}
+          width="100%"
+          itemData={virtualData}
+          itemSize={ROW_HEIGHT}
+          itemCount={items.length}
+        >
+          {Row}
+        </List>
+      ) : (
+        <div className={styles.emptyMessage}>
+          <Trans i18nKey="browse-dashboards.folder-picker.empty-message">No folders found</Trans>
+        </div>
+      )}
     </div>
   );
 }
@@ -132,7 +139,6 @@ function Row({ index, style: virtualStyles, data }: RowProps) {
         )}
 
         <label className={styles.label} htmlFor={id}>
-          {/* TODO: text is not truncated properly, it still overflows the container */}
           <Text as="span" truncate>
             {item.title}
           </Text>
@@ -159,6 +165,12 @@ const getStyles = (theme: GrafanaTheme2) => {
       background: theme.components.input.background,
     }),
 
+    emptyMessage: css({
+      padding: theme.spacing(1),
+      textAlign: 'center',
+      width: '100%',
+    }),
+
     // Should be the same size as the <IconButton /> for proper alignment
     folderButtonSpacer: css({
       paddingLeft: `calc(${getSvgSize(CHEVRON_SIZE)}px + ${theme.spacing(0.5)})`,
diff --git a/public/app/core/components/NestedFolderPicker/NestedFolderPicker.test.tsx b/public/app/core/components/NestedFolderPicker/NestedFolderPicker.test.tsx
index a9a0cba087c..0306c783ce9 100644
--- a/public/app/core/components/NestedFolderPicker/NestedFolderPicker.test.tsx
+++ b/public/app/core/components/NestedFolderPicker/NestedFolderPicker.test.tsx
@@ -86,7 +86,7 @@ describe('NestedFolderPicker', () => {
     expect(screen.queryByRole('button', { name: 'Select folder' })).not.toBeInTheDocument();
 
     // Search input and folder tree are visible
-    expect(screen.getByPlaceholderText('Search folder')).toBeInTheDocument();
+    expect(screen.getByPlaceholderText('Search folders')).toBeInTheDocument();
     expect(screen.getByLabelText('Dashboards')).toBeInTheDocument();
     expect(screen.getByLabelText(folderA.item.title)).toBeInTheDocument();
     expect(screen.getByLabelText(folderB.item.title)).toBeInTheDocument();
diff --git a/public/app/core/components/NestedFolderPicker/NestedFolderPicker.tsx b/public/app/core/components/NestedFolderPicker/NestedFolderPicker.tsx
index ce9faf8820a..e6b26525c6d 100644
--- a/public/app/core/components/NestedFolderPicker/NestedFolderPicker.tsx
+++ b/public/app/core/components/NestedFolderPicker/NestedFolderPicker.tsx
@@ -5,8 +5,9 @@ import { usePopperTooltip } from 'react-popper-tooltip';
 import { useAsync } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Alert, Button, FilterInput, LoadingBar, useStyles2 } from '@grafana/ui';
+import { Alert, Button, Icon, Input, LoadingBar, useStyles2 } from '@grafana/ui';
 import { Text } from '@grafana/ui/src/components/Text/Text';
+import { Trans, t } from 'app/core/internationalization';
 import { skipToken, useGetFolderQuery } from 'app/features/browse-dashboards/api/browseDashboardsAPI';
 import { listFolders, PAGE_SIZE } from 'app/features/browse-dashboards/api/services';
 import { createFlatTree } from 'app/features/browse-dashboards/state';
@@ -172,7 +173,7 @@ export function NestedFolderPicker({ value, onChange }: NestedFolderPickerProps)
           <Skeleton width={100} />
         ) : (
           <Text as="span" truncate>
-            {label ?? 'Select folder'}
+            {label ?? <Trans i18nKey="browse-dashboards.folder-picker.button-label">Select folder</Trans>}
           </Text>
         )}
       </Button>
@@ -181,14 +182,15 @@ export function NestedFolderPicker({ value, onChange }: NestedFolderPickerProps)
 
   return (
     <>
-      <FilterInput
+      <Input
         ref={setTriggerRef}
         autoFocus
-        placeholder={label ?? 'Search folder'}
+        placeholder={label ?? t('browse-dashboards.folder-picker.search-placeholder', 'Search folders')}
         value={search}
-        escapeRegex={false}
         className={styles.search}
-        onChange={(val) => setSearch(val)}
+        onChange={(e) => setSearch(e.currentTarget.value)}
+        role="combobox"
+        suffix={<Icon name="search" />}
       />
       <fieldset
         ref={setTooltipRef}
@@ -200,8 +202,12 @@ export function NestedFolderPicker({ value, onChange }: NestedFolderPickerProps)
         })}
       >
         {error ? (
-          <Alert className={styles.error} severity="warning" title="Error loading folders">
-            {error.message || error.toString?.() || 'Unknown error'}
+          <Alert
+            className={styles.error}
+            severity="warning"
+            title={t('browse-dashboards.folder-picker.error-title', 'Error loading folders')}
+          >
+            {error.message || error.toString?.() || t('browse-dashboards.folder-picker.unknown-error', 'Unknown error')}
           </Alert>
         ) : (
           <div>
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index 6ac25367b48..00a747069c7 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -61,6 +61,13 @@
       "manage-permissions": "",
       "move": ""
     },
+    "folder-picker": {
+      "button-label": "",
+      "empty-message": "",
+      "error-title": "",
+      "search-placeholder": "",
+      "unknown-error": ""
+    },
     "manage-folder-nav": {
       "alert-rules": "",
       "dashboards": "",
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index ecccf6744f4..c659816e5bb 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -61,6 +61,13 @@
       "manage-permissions": "Manage permissions",
       "move": "Move"
     },
+    "folder-picker": {
+      "button-label": "Select folder",
+      "empty-message": "No folders found",
+      "error-title": "Error loading folders",
+      "search-placeholder": "Search folders",
+      "unknown-error": "Unknown error"
+    },
     "manage-folder-nav": {
       "alert-rules": "Alert rules",
       "dashboards": "Dashboards",
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index ce1d21e8ff6..fd6e4413b81 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -66,6 +66,13 @@
       "manage-permissions": "",
       "move": ""
     },
+    "folder-picker": {
+      "button-label": "",
+      "empty-message": "",
+      "error-title": "",
+      "search-placeholder": "",
+      "unknown-error": ""
+    },
     "manage-folder-nav": {
       "alert-rules": "",
       "dashboards": "",
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index 547011c0e4a..953a7b92a56 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -66,6 +66,13 @@
       "manage-permissions": "",
       "move": ""
     },
+    "folder-picker": {
+      "button-label": "",
+      "empty-message": "",
+      "error-title": "",
+      "search-placeholder": "",
+      "unknown-error": ""
+    },
     "manage-folder-nav": {
       "alert-rules": "",
       "dashboards": "",
diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json
index 6f52fecca31..b3f4ee574ed 100644
--- a/public/locales/pseudo-LOCALE/grafana.json
+++ b/public/locales/pseudo-LOCALE/grafana.json
@@ -61,6 +61,13 @@
       "manage-permissions": "Mäʼnäģę pęřmįşşįőʼnş",
       "move": "Mővę"
     },
+    "folder-picker": {
+      "button-label": "Ŝęľęčŧ ƒőľđęř",
+      "empty-message": "Ńő ƒőľđęřş ƒőūʼnđ",
+      "error-title": "Ēřřőř ľőäđįʼnģ ƒőľđęřş",
+      "search-placeholder": "Ŝęäřčĥ ƒőľđęřş",
+      "unknown-error": "Ůʼnĸʼnőŵʼn ęřřőř"
+    },
     "manage-folder-nav": {
       "alert-rules": "Åľęřŧ řūľęş",
       "dashboards": "Đäşĥþőäřđş",
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index c367870cca7..5af9c0ff9ac 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -56,6 +56,13 @@
       "manage-permissions": "",
       "move": ""
     },
+    "folder-picker": {
+      "button-label": "",
+      "empty-message": "",
+      "error-title": "",
+      "search-placeholder": "",
+      "unknown-error": ""
+    },
     "manage-folder-nav": {
       "alert-rules": "",
       "dashboards": "",