diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx
index 364ed424a..0cc31cb40 100644
--- a/client/homebrew/editor/editor.jsx
+++ b/client/homebrew/editor/editor.jsx
@@ -82,6 +82,7 @@ const Editor = createClass({
 		if(prevProps.moveSource !== this.props.moveSource) {
 			this.sourceJump();
 		};
+		this.codeEditor.current?.codeMirror.focus();
 	},
 
 	handleControlKeys : function(e){