diff --git a/src/renderer/components/Login.vue b/src/renderer/components/Login.vue
index 21fa9c99..87afd5a5 100644
--- a/src/renderer/components/Login.vue
+++ b/src/renderer/components/Login.vue
@@ -36,7 +36,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-#login /deep/ {
+#login {
   background-color: #292f3f;
   color: #ffffff;
   text-align: center;
@@ -49,15 +49,5 @@ export default {
       font-size: 24px;
     }
   }
-
-  .el-form-item__label {
-    color: #f0f3f9;
-  }
-
-  .el-input__inner {
-    background-color: #373d48;
-    color: #ffffff;
-    border: 0;
-  }
 }
 </style>
diff --git a/src/renderer/components/Login/LoginForm.vue b/src/renderer/components/Login/LoginForm.vue
index 60ba2016..e9ec34b5 100644
--- a/src/renderer/components/Login/LoginForm.vue
+++ b/src/renderer/components/Login/LoginForm.vue
@@ -1,7 +1,7 @@
 <template>
   <el-form ref="loginForm" label-width="120px" label-position="top" v-on:submit.prevent="confirm('loginForm')" class="login-form" :rules="rules" :model="form">
     <el-form-item label="First, let's log in to a Mastodon instance. Please enter an instance domain name." prop="domainName">
-      <el-input v-model="form.domainName" placeholder="mastodon.social"></el-input>
+      <el-input v-model="form.domainName" placeholder="mastodon.social" v-shortkey="['enter']" @shortkey.native="handleKey"></el-input>
     </el-form-item>
     <!-- Dummy form to guard submitting with enter -->
     <el-form-item class="hidden">
@@ -106,16 +106,33 @@ export default {
           return false
         }
       })
+    },
+    handleKey (event) {
+      if (!this.selectedInstance) {
+        this.confirm('loginForm')
+      } else {
+        this.login()
+      }
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.login-form {
+.login-form /deep/ {
   margin: 0 auto;
   width: 300px;
 
+  .el-form-item__label {
+    color: #f0f3f9;
+  }
+
+  .el-input__inner {
+    background-color: #373d48;
+    color: #fff;
+    border: 0;
+  }
+
   .instance-group {
     text-align: left;
     margin: 0 auto;