diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js
index b9029236..eb1ba71b 100644
--- a/scripts/pi-hole/js/footer.js
+++ b/scripts/pi-hole/js/footer.js
@@ -196,3 +196,12 @@ if(versionCompare(piholeVersion, "v2.9.5") < 1)
 {
 	$("#btnSearchExact").hide();
 }
+
+// Handle Strg + Enter button on Login page
+$(document).keypress(function(e) {
+	console.log(e.which);
+	if(e.which === 10 && $("#loginpw").is(":focus")) {
+		$("#loginform").attr('action', 'settings.php');
+		$("#loginform").submit();
+	}
+});
diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php
index a0366dfb..bc38ac60 100644
--- a/scripts/pi-hole/php/loginpage.php
+++ b/scripts/pi-hole/php/loginpage.php
@@ -13,9 +13,9 @@
     </div>
 
     <div class="panel-body">
-      <form action="" method="post">
+      <form action="" id="loginform" method="post">
         <div class="form-group has-feedback <?php if ($wrongpassword) { ?>has-error<?php } ?> ">
-          <input type="password" name="pw" class="form-control" placeholder="Password" autofocus>
+          <input type="password" id="loginpw" name="pw" class="form-control" placeholder="Password" autofocus>
           <span class="glyphicon glyphicon-lock form-control-feedback"></span>
         </div>
         <div class="row">