diff --git a/src/coffee/controllers/markdown_section_controller.coffee b/src/coffee/controllers/markdown_section_controller.coffee
index 528f38781..1f0e25edc 100644
--- a/src/coffee/controllers/markdown_section_controller.coffee
+++ b/src/coffee/controllers/markdown_section_controller.coffee
@@ -247,4 +247,8 @@ module.exports = class MarkdownSectionController extends BaseController
         else if toShow.length > 0
             @show $el for $el in toShow
 
+        if @state is State.editing
+            @once Event.animate.show.finish, =>
+                @$textarea.focus()
+
         @$errorText.html errorText