diff --git a/src/panels/config/areas/dialog-area-registry-detail.ts b/src/panels/config/areas/dialog-area-registry-detail.ts
index de7574b00c..ae3e1e37d2 100644
--- a/src/panels/config/areas/dialog-area-registry-detail.ts
+++ b/src/panels/config/areas/dialog-area-registry-detail.ts
@@ -42,7 +42,7 @@ class DialogAreaDetail extends LitElement {
       return html``;
     }
     const entry = this._params.entry;
-    const nameInvalid = this._name.trim() === "";
+    const nameInvalid = !this._isNameValid();
     return html`
       <ha-paper-dialog
         with-backdrop
@@ -71,6 +71,7 @@ class DialogAreaDetail extends LitElement {
             <paper-input
               .value=${this._name}
               @value-changed=${this._nameChanged}
+              @keyup=${this._handleKeyup}
               .label=${this.hass.localize("ui.panel.config.areas.editor.name")}
               .errorMessage=${this.hass.localize(
                 "ui.panel.config.areas.editor.name_required"
@@ -104,6 +105,16 @@ class DialogAreaDetail extends LitElement {
     `;
   }
 
+  private _isNameValid() {
+    return this._name.trim() !== "";
+  }
+
+  private _handleKeyup(ev: KeyboardEvent) {
+    if (ev.keyCode === 13 && this._isNameValid() && !this._submitting) {
+      this._updateEntry();
+    }
+  }
+
   private _nameChanged(ev: PolymerChangedEvent<string>) {
     this._error = undefined;
     this._name = ev.detail.value;