diff --git a/src/components/macro/header/macro-header.component.ts b/src/components/macro/header/macro-header.component.ts
index ddec48e3..bfe540a0 100644
--- a/src/components/macro/header/macro-header.component.ts
+++ b/src/components/macro/header/macro-header.component.ts
@@ -1,5 +1,5 @@
 import {
-    AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, Input, Renderer,
+    AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, Input, OnChanges, Renderer,
     ViewChild
 } from '@angular/core';
 
@@ -16,13 +16,19 @@ import { AppState } from '../../../store/index';
     styles: [require('./macro-header.component.scss')],
     changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class MacroHeaderComponent implements AfterViewInit {
+export class MacroHeaderComponent implements AfterViewInit, OnChanges {
     @Input() macro: Macro;
     @Input() isNew: boolean;
     @ViewChild('macroName') macroName: ElementRef;
 
     constructor(private store: Store<AppState>, private renderer: Renderer) { }
 
+    ngOnChanges() {
+        if (this.isNew) {
+            this.renderer.invokeElementMethod(this.macroName.nativeElement, 'select', []);
+        }
+    }
+
     ngAfterViewInit() {
         if (this.isNew) {
             this.renderer.invokeElementMethod(this.macroName.nativeElement, 'select', []);
@@ -45,4 +51,5 @@ export class MacroHeaderComponent implements AfterViewInit {
 
         this.store.dispatch(MacroActions.editMacroName(this.macro.id, name));
     }
+
 }