diff --git a/modules/list/components/ListItem.js b/modules/list/components/ListItem.js
index 91c425c2..fcb894aa 100755
--- a/modules/list/components/ListItem.js
+++ b/modules/list/components/ListItem.js
@@ -80,6 +80,7 @@ export default class ListItem extends React.Component {
         <input
           ref="editField"
           className="edit"
+          autoFocus
           value={ this.state.title }
           onBlur={ this.handleSubmit }
           onChange={ this.handleChange }