diff --git a/browser/styles/main/HomeContainer/components/ArticleNavigator.styl b/browser/styles/main/HomeContainer/components/ArticleNavigator.styl
index af61cf3d..93fd515f 100644
--- a/browser/styles/main/HomeContainer/components/ArticleNavigator.styl
+++ b/browser/styles/main/HomeContainer/components/ArticleNavigator.styl
@@ -14,7 +14,7 @@ articleCount = #999
     .userProfileName
       color brandColor
       font-size 28px
-      padding 6px 0 0 10px
+      padding 6px 37px 0 10px
       white-space nowrap
       text-overflow ellipsis
       overflow hidden
diff --git a/lib/components/modal/EditedAlert.js b/lib/components/modal/EditedAlert.js
index fd60258d..5b487bb3 100644
--- a/lib/components/modal/EditedAlert.js
+++ b/lib/components/modal/EditedAlert.js
@@ -1,8 +1,13 @@
 import React, { PropTypes } from 'react'
+import ReactDOM from 'react-dom'
 import store from 'boost/store'
 import { unlockStatus, clearNewArticle } from 'boost/actions'
 
 export default class EditedAlert extends React.Component {
+  componentDidMount () {
+    ReactDOM.findDOMNode(this.refs.no).focus()
+  }
+
   handleNoButtonClick (e) {
     this.props.close()
   }
@@ -22,8 +27,8 @@ export default class EditedAlert extends React.Component {
         <div className='message'>Do you really want to leave without finishing?</div>
 
         <div className='control'>
-          <button onClick={e => this.handleNoButtonClick(e)}><i className='fa fa-fw fa-close'/> No</button>
-          <button onClick={e => this.handleYesButtonClick(e)} className='primary'><i className='fa fa-fw fa-check'/> Yes</button>
+          <button ref='no' onClick={e => this.handleNoButtonClick(e)}><i className='fa fa-fw fa-close'/> No</button>
+          <button ref='yes' onClick={e => this.handleYesButtonClick(e)} className='primary'><i className='fa fa-fw fa-check'/> Yes</button>
         </div>
       </div>
     )