diff --git a/app/assets/javascripts/app/frontend/controllers/editor.js b/app/assets/javascripts/app/frontend/controllers/editor.js
index 370b00f2f..cc13450e4 100644
--- a/app/assets/javascripts/app/frontend/controllers/editor.js
+++ b/app/assets/javascripts/app/frontend/controllers/editor.js
@@ -205,6 +205,7 @@ angular.module('app.frontend')
     this.toggleMarkdown = function() {
       if(this.editorMode == 'preview') {
         this.editorMode = 'edit';
+        this.focusEditor(0);
       } else {
         this.editorMode = 'preview';
       }