diff --git a/src/browser/pages/login.css b/src/browser/pages/login.css
index 43d03e7e..4a66567c 100644
--- a/src/browser/pages/login.css
+++ b/src/browser/pages/login.css
@@ -26,7 +26,7 @@ body {
   border: 1px solid #ddd;
   box-sizing: border-box;
   color: black;
-  flex: 1;
+  width: 100%;
   padding: 16px;
 }
 
@@ -34,6 +34,16 @@ body {
   display: none;
 }
 
-.login-form > .field > .submit {
-  margin-left: 20px;
+.login-form > .field > input[type="submit"] {
+  position: absolute;
+  left: -9999px;
+}
+
+.login-form > .field > input[type="submit"]:focus + label {
+  border: 2px solid #000;
+}
+
+.login-form > .field > .submit{
+  margin-left: 20px;
+  flex-shrink: 0;
 }
diff --git a/src/browser/pages/login.html b/src/browser/pages/login.html
index fc772f39..dcfb8f63 100644
--- a/src/browser/pages/login.html
+++ b/src/browser/pages/login.html
@@ -38,7 +38,8 @@
                 name="password"
                 autocomplete="current-password"
               />
-              <input class="submit -button" value="SUBMIT" type="submit" />
+	            <input value="SUBMIT" type="submit" id="submit-button">
+	            <label for="submit-button" class="submit -button">SUBMIT</label>
             </div>
             {{ERROR}}
           </form>