diff --git a/site/client/app/components/landing.js b/site/client/app/components/landing.js
index e294772..ea4cec3 100644
--- a/site/client/app/components/landing.js
+++ b/site/client/app/components/landing.js
@@ -37,7 +37,13 @@ module.exports = {
 
       setTimeout(function() {
         $('.login-username').focus();
-      }, 500);
+      }, 300);
+    },
+
+    closeLogin: function(e) {
+      if($(e.target).context.className == 'modal active') {
+        this.modal = false;
+      }
     }
   }
 
diff --git a/site/client/app/views/modals/login.html b/site/client/app/views/modals/login.html
index c8e5bf2..1579990 100644
--- a/site/client/app/views/modals/login.html
+++ b/site/client/app/views/modals/login.html
@@ -1,4 +1,4 @@
-<div class="modal" v-class="active: modal">
+<div class="modal" v-class="active: modal" v-on="click: closeLogin">
   <div class="modal-banner">
     <div class="wrap-modal-login">