diff --git a/src/widgets/host-selector.jsx b/src/widgets/host-selector.jsx
index bafd9862..74870d96 100644
--- a/src/widgets/host-selector.jsx
+++ b/src/widgets/host-selector.jsx
@@ -15,6 +15,7 @@ export default class HostSelector extends React.PureComponent {
 
     this.handleHostNameChange = this.handleHostNameChange.bind(this);
     this.handleEditingFinished = this.handleEditingFinished.bind(this);
+    this.handleKeyDown = this.handleKeyDown.bind(this);
   }
 
   handleHostNameChange(e) {
@@ -28,6 +29,12 @@ export default class HostSelector extends React.PureComponent {
     }
   }
 
+  handleKeyDown(e) {
+    if (e.key == 'Enter') {
+      this.handleEditingFinished();
+    }
+  }
+
   render() {
     var hostOptions = [];
     for (let key in KNOWN_HOSTS) {
@@ -40,7 +47,8 @@ export default class HostSelector extends React.PureComponent {
       <div className="panel-form-row">
         <input type="search" id="host-name" placeholder={this.props.hostName} list="known-hosts"
           className="quoted" value={this.state.hostName} onChange={this.handleHostNameChange}
-          onBlur={this.handleEditingFinished} required />
+          onBlur={this.handleEditingFinished}
+          onKeyDown={this.handleKeyDown} required />
         <datalist id="known-hosts">
           {hostOptions}
         </datalist>