diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7560f281..831a4d26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to [`@bpmn-io/properties-panel`](https://github.com/bpmn-io/
 ___Note:__ Yet to be released changes appear here._
 
 * `FEAT`: do not sort list items alphabetically ([#311](https://github.com/bpmn-io/properties-panel/issues/311))
+* `FEAT`: scroll focused list item entry into view ([#360](https://github.com/bpmn-io/properties-panel/pull/360))
 * `CHORE`: remove `shouldSort` behavior for list groups ([#353](https://github.com/bpmn-io/properties-panel/pull/353))
 * `CHORE`: remove `compareFn` prop for `List` component, the caller may decide on insertion points of new items ([#353](https://github.com/bpmn-io/properties-panel/pull/353))
 
diff --git a/src/components/ListItem.js b/src/components/ListItem.js
index b605413d..886a2221 100644
--- a/src/components/ListItem.js
+++ b/src/components/ListItem.js
@@ -34,6 +34,7 @@ export default function ListItem(props) {
           focusableInput.focus();
         }
 
+        focusableInput.scrollIntoView();
       }
     }
   }, [ autoOpen, autoFocusEntry ]);