diff --git a/frontend/components/MarkdownEditor/MarkdownEditor.js b/frontend/components/MarkdownEditor/MarkdownEditor.js
index c692d8a7..f5f4619a 100644
--- a/frontend/components/MarkdownEditor/MarkdownEditor.js
+++ b/frontend/components/MarkdownEditor/MarkdownEditor.js
@@ -120,6 +120,7 @@ class MarkdownEditor extends React.Component {
       viewportMargin: Infinity,
       scrollbarStyle: 'null',
       theme: 'atlas',
+      autofocus: true,
       extraKeys: {
         Enter: 'newlineAndIndentContinueMarkdownList',