diff --git a/components/frontend/src/widgets/buttons/AddDropdownButton.jsx b/components/frontend/src/widgets/buttons/AddDropdownButton.jsx
index 6f41cf4a13..4252c1ae29 100644
--- a/components/frontend/src/widgets/buttons/AddDropdownButton.jsx
+++ b/components/frontend/src/widgets/buttons/AddDropdownButton.jsx
@@ -105,6 +105,7 @@ export function AddDropdownButton({ itemSubtypes, itemType, onClick, allItemSubt
             </Tooltip>
             <Popover id="dropdown-menu" anchorEl={anchorEl} onClose={() => setAnchorEl(null)} open={Boolean(anchorEl)}>
                 <TextField
+                    autoFocus
                     fullWidth
                     label={`Filter ${itemType} types`}
                     onChange={(event) => setQuery(event.target.value)}
diff --git a/components/frontend/src/widgets/buttons/AddDropdownButton.test.jsx b/components/frontend/src/widgets/buttons/AddDropdownButton.test.jsx
index 5e51e40f46..b1b1d8078c 100644
--- a/components/frontend/src/widgets/buttons/AddDropdownButton.test.jsx
+++ b/components/frontend/src/widgets/buttons/AddDropdownButton.test.jsx
@@ -38,6 +38,7 @@ test("AddDropdownButton mouse navigation", async () => {
     await act(async () => {
         fireEvent.click(screen.getByText(/Add foo/))
     })
+    expect(screen.getByLabelText(/Filter/)).toHaveFocus()
     await act(async () => {
         fireEvent.click(screen.getByText(/Sub 2/))
     })
@@ -49,6 +50,7 @@ test("AddDropdownButton keyboard navigation", async () => {
     await act(async () => {
         fireEvent.click(screen.getByText(/Add foo/))
     })
+    expect(screen.getByLabelText(/Filter/)).toHaveFocus()
     await act(async () => {
         fireEvent.keyDown(screen.getByText(/Available/), { key: "ArrowDown" })
     })
diff --git a/docs/src/changelog.md b/docs/src/changelog.md
index 94529f749a..49135f8de7 100644
--- a/docs/src/changelog.md
+++ b/docs/src/changelog.md
@@ -17,6 +17,7 @@ If your currently installed *Quality-time* version is not the latest version, pl
 ### Added
 
 - Support the new SonarQube impact severity levels "blocker" and "info", introduced in SonarQube v10.8. Closes [#10708](https://github.com/ICTU/quality-time/issues/10708).
+- After clicking "Add metric", give focus to the filter field automatically. Closes [#10743](https://github.com/ICTU/quality-time/issues/10743).
 
 ### Fixed