diff --git a/ShareX.HelpersLib/Automate/AutomateForm.cs b/ShareX.HelpersLib/Automate/AutomateForm.cs
index 06c4f0497..c564c3298 100644
--- a/ShareX.HelpersLib/Automate/AutomateForm.cs
+++ b/ShareX.HelpersLib/Automate/AutomateForm.cs
@@ -54,7 +54,6 @@ private AutomateForm(List<ScriptInfo> scripts)
             tokenizer.Keywords = FunctionManager.Functions.Select(x => x.Key).ToArray();
             cbFunctions.Items.AddRange(tokenizer.Keywords);
             cbKeys.Items.AddRange(Enum.GetNames(typeof(Keys)).Skip(1).ToArray());
-            Tokenize();
 
             Scripts = scripts;
 
@@ -71,6 +70,8 @@ private AutomateForm(List<ScriptInfo> scripts)
             {
                 SetExample();
             }
+
+            Tokenize();
         }
 
         public static AutomateForm GetInstance(List<ScriptInfo> scripts)
@@ -313,7 +314,8 @@ private void btnAddMouseMove_Click(object sender, EventArgs e)
                 Point position = Cursor.Position;
                 this.InvokeSafe(() =>
                 {
-                    rtbInput.SelectedText = string.Format("MouseMove {0} {1}", position.X, position.Y);
+                    rtbInput.SelectedText = string.Format("MouseMove {0} {1}\r\n", position.X, position.Y);
+                    rtbInput.Focus();
                 });
             });