diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java
index a7d6e3a97..900dcd80c 100644
--- a/project/java/MainActivity.java
+++ b/project/java/MainActivity.java
@@ -525,10 +525,17 @@ public class MainActivity extends Activity
 							}
 							public boolean onKeyDown(int keyCode, final KeyEvent event)
 							{
+								if (keyCode == KeyEvent.KEYCODE_BACK)
+									return true;
 								return false;
 							}
 							public boolean onKeyUp(int keyCode, final KeyEvent event)
 							{
+								if (keyCode == KeyEvent.KEYCODE_BACK)
+								{
+									showScreenKeyboardWithoutTextInputField(); // Hide keyboard
+									return true;
+								}
 								return false;
 							}
 						}
diff --git a/project/jni/application/hid-pc-keyboard/src b/project/jni/application/hid-pc-keyboard/src
index 509d4ff9d..19679e60d 160000
--- a/project/jni/application/hid-pc-keyboard/src
+++ b/project/jni/application/hid-pc-keyboard/src
@@ -1 +1 @@
-Subproject commit 509d4ff9d1dfbd3ee3cdeacd076aed7159ff9a36
+Subproject commit 19679e60d146263ca6c3e9d01556801c9d63770b