diff --git a/interface/resources/html/raiseAndLowerKeyboard.js b/interface/resources/html/raiseAndLowerKeyboard.js
index 0fb5529052..63e016c5d4 100644
--- a/interface/resources/html/raiseAndLowerKeyboard.js
+++ b/interface/resources/html/raiseAndLowerKeyboard.js
@@ -19,7 +19,7 @@
     function shouldRaiseKeyboard() {
         var nodeName = document.activeElement.nodeName;
         var nodeType = document.activeElement.type;
-        if (nodeName === "INPUT" && (nodeType === "text" || nodeType === "number")
+        if (nodeName === "INPUT" && (nodeType === "text" || nodeType === "number" || nodeType === "password")
             || document.activeElement.nodeName === "TEXTAREA") {
             return true;
         } else {
diff --git a/scripts/system/html/js/keyboardControl.js b/scripts/system/html/js/keyboardControl.js
index 964f5f5786..f2937bc63a 100644
--- a/scripts/system/html/js/keyboardControl.js
+++ b/scripts/system/html/js/keyboardControl.js
@@ -56,7 +56,7 @@ function setUpKeyboardControl() {
         }
     }
 
-    var inputs = document.querySelectorAll("input[type=text], input[type=number], textarea");
+    var inputs = document.querySelectorAll("input[type=text], input[type=password], input[type=number], textarea");
     for (var i = 0, length = inputs.length; i < length; i++) {
         inputs[i].addEventListener("focus", raiseKeyboard);
         inputs[i].addEventListener("blur", lowerKeyboard);