diff --git a/src/components/keymap/header/keymap-header.component.html b/src/components/keymap/header/keymap-header.component.html
index 90694f61..338439b1 100644
--- a/src/components/keymap/header/keymap-header.component.html
+++ b/src/components/keymap/header/keymap-header.component.html
@@ -1,13 +1,15 @@
 <div class="row">
     <h1 class="col-xs-12 pane-title">
         <i class="fa fa-keyboard-o"></i>
-        <input class="keymap__name pane-title__name"
+        <input #name class="keymap__name pane-title__name"
                value="{{ keymap.name }}"
                (change)="editKeymapName($event.target.value)"
+               (keyup.enter)="name.blur()"
         /> keymap
-        (<input class="keymap__abbrev pane-title__abbrev"
+        (<input #abbr class="keymap__abbrev pane-title__abbrev"
                 value="{{ keymap.abbreviation }}"
                 (change)="editKeymapAbbr($event.target.value)"
+                (keyup.enter)="abbr.blur()"
                 [attr.maxLength]="3"
         />)
         <i class="fa keymap__is-default"
diff --git a/src/components/macro/header/macro-header.component.html b/src/components/macro/header/macro-header.component.html
index f23b86d8..0ec9c927 100644
--- a/src/components/macro/header/macro-header.component.html
+++ b/src/components/macro/header/macro-header.component.html
@@ -1,10 +1,10 @@
 <div class="row">
     <h1 class="col-xs-12 pane-title">
         <i class="fa fa-play"></i>
-        <input class="pane-title__name"
+        <input #macroName class="pane-title__name"
                value="{{ macro.name }}"
                (change)="editMacroName($event.target.value)"
-               #macroName
+               (keyup.enter)="macroName.blur()"
         />
         <i class="glyphicon glyphicon-trash macro__remove pull-right" title=""
            data-toggle="tooltip"