diff --git a/html/pages/device/edit/device.inc.php b/html/pages/device/edit/device.inc.php
index b099ca454f..386ef062ef 100644
--- a/html/pages/device/edit/device.inc.php
+++ b/html/pages/device/edit/device.inc.php
@@ -132,7 +132,7 @@ if ($_POST['editing']) {
     <div class="form-group">
         <label for="sysLocation" class="col-sm-2 control-label">Override sysLocation:</label>
         <div class="col-sm-6">
-          <input onclick="edit.sysLocation.disabled=!edit.override_sysLocation.checked" type="checkbox" name="override_sysLocation"
+          <input onclick="edit.sysLocation.disabled=!edit.override_sysLocation.checked; edit.sysLocation.select()" type="checkbox" name="override_sysLocation"
                 <?php
                 if ($device_model->override_sysLocation) {
                     echo(' checked="1"');
@@ -236,6 +236,12 @@ if ($_POST['editing']) {
             document.getElementById('edit-hostname-input').disabled = true;
         }
     });
+    $('#sysLocation').keypress(function (e) {
+        if(e.keyCode === 13) {
+            e.preventDefault();
+            $('#edit').submit();
+        }
+    });
     $('#parent_id').select2({
         width: 'resolve'
     });