diff --git a/client/modules/IDE/components/NewFolderForm.js b/client/modules/IDE/components/NewFolderForm.js
index 53da3755..0b6e3696 100644
--- a/client/modules/IDE/components/NewFolderForm.js
+++ b/client/modules/IDE/components/NewFolderForm.js
@@ -6,6 +6,10 @@ class NewFolderForm extends React.Component {
     this.createFolder = this.props.createFolder.bind(this);
   }
 
+  componentDidMount() {
+    this.refs.fileName.focus();
+  }
+
   render() {
     const { fields: { name }, handleSubmit } = this.props;
     return (