diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index a131aac7..17d8ad9f 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -74,9 +74,11 @@ class MarkdownEditor extends React.Component {
       }, () => {
         if (newStatus === 'CODE') {
           this.refs.code.focus()
+          eventEmitter.emit('topbar:lock')
         } else {
           this.refs.code.blur()
           this.refs.preview.focus()
+          eventEmitter.emit('topbar:lock')
         }
       })
     }
@@ -91,9 +93,9 @@ class MarkdownEditor extends React.Component {
       this.setState({
         status: 'PREVIEW'
       }, () => {
-        eventEmitter.emit('topbar:lock')
         this.refs.preview.focus()
         this.refs.preview.scrollTo(cursorPosition.line)
+        eventEmitter.emit('topbar:lock')
       })
     }
   }
@@ -109,6 +111,7 @@ class MarkdownEditor extends React.Component {
         status: 'CODE'
       }, () => {
         this.refs.code.focus()
+        eventEmitter.emit('topbar:lock')
       })
     }
   }
@@ -145,6 +148,7 @@ class MarkdownEditor extends React.Component {
         this.refs.code.focus()
       })
     } else {
+      eventEmitter.emit('topbar:lock')
       this.refs.code.focus()
     }
   }
diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index 3bac9ea8..2ab64277 100644
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -26,7 +26,7 @@ class MarkdownNoteDetail extends React.Component {
         title: '',
         content: ''
       }, props.note),
-      isCODE: false,
+      editorStatus: false,
       locked: false
     }
     this.dispatchTimer = null
@@ -213,8 +213,8 @@ class MarkdownNoteDetail extends React.Component {
   }
 
   handleLockButtonClick () {
-    ee.emit('editor:lock')
     this.focus()
+    ee.emit('editor:lock')
     this.setState({ locked: !this.state.locked })
   }
 
@@ -227,7 +227,11 @@ class MarkdownNoteDetail extends React.Component {
   }
 
   handleShowLockButton () {
-    this.setState({isCODE: !this.state.isCODE})
+    this.setState({editorStatus: this.refs.content.state.status})
+  }
+
+  handleFocus (e) {
+    this.focus()
   }
 
   render () {
@@ -263,9 +267,10 @@ class MarkdownNoteDetail extends React.Component {
           <div styleName='info-right'>
             {(() => {
               let faClassName=`fa ${this.toggleLockButton()}`
-              if (this.state.isCODE) {
+              if (this.state.editorStatus === 'CODE') {
                 return(
                   <button styleName='info-right-button'
+                    onFocus={(e) => this.handleFocus(e)}
                     onClick={(e) => this.handleLockButtonClick(e)}
                   >
                     <i className={faClassName}/>