diff --git a/ui/src/components/LoginModal.vue b/ui/src/components/LoginModal.vue
index ab6a5be..815529b 100644
--- a/ui/src/components/LoginModal.vue
+++ b/ui/src/components/LoginModal.vue
@@ -26,7 +26,7 @@
         </section>
 
         <footer class="modal-card-foot">
-          <button class="button is-success" @click="submit">Login</button>
+          <button class="button is-success" @click="submit()">Login</button>
           <button class="button is-danger" @click="set_active(false)">
             Cancel
           </button>
@@ -44,6 +44,12 @@ export default class LoginModal extends Vue {
   private username = "";
   private password = "";
 
+  public created(): void {
+    window.addEventListener("keydown", (e) => {
+      if (e.key == "Escape") this.set_active(false);
+    });
+  }
+
   public set_active(state: boolean): void {
     this.active = state;