diff --git a/src/components/panels/MiniconsolePanel.vue b/src/components/panels/MiniconsolePanel.vue
index 3fa02dd1..83203c98 100644
--- a/src/components/panels/MiniconsolePanel.vue
+++ b/src/components/panels/MiniconsolePanel.vue
@@ -139,6 +139,10 @@ export default class MiniconsolePanel extends Mixins(BaseMixin) {
 
     commandClick(msg: string): void {
         this.gcode = msg
+
+        this.$nextTick(() => {
+            this.$refs.gcodeCommandField.focus()
+        })
     }
 
     doSend(cmd: KeyboardEvent) {
diff --git a/src/pages/Console.vue b/src/pages/Console.vue
index 7afa5220..f044b145 100644
--- a/src/pages/Console.vue
+++ b/src/pages/Console.vue
@@ -133,6 +133,10 @@ export default class PageConsole extends Mixins(BaseMixin) {
 
     commandClick(msg: string): void {
         this.gcode = msg
+
+        this.$nextTick(() => {
+            this.$refs.gcodeCommandField.focus()
+        })
     }
 
     doSend(cmd: KeyboardEvent): void {