diff --git a/browser/main/modal/NewRepositoryModal.js b/browser/main/modal/NewRepositoryModal.js
index c1433e5f..b777278a 100644
--- a/browser/main/modal/NewRepositoryModal.js
+++ b/browser/main/modal/NewRepositoryModal.js
@@ -10,7 +10,7 @@ const remote = electron.remote
 function browseFolder () {
   let dialog = remote.dialog
 
-  let defaultPath = remote.app.getHomeDir()
+  let defaultPath = remote.app.getPath('home')
   return new Promise((resolve, reject) => {
     dialog.showOpenDialog({
       title: 'Select Directory',
@@ -36,6 +36,10 @@ class NewRepositoryModal extends React.Component {
     }
   }
 
+  componentDidMount () {
+    this.refs.nameInput.focus()
+  }
+
   handleCloseButtonClick (e) {
     this.props.close()
   }