diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
index 096f3e702..45a4a9508 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -797,7 +797,9 @@ public class LatinKeyboard extends Keyboard {
         if (mCurrentlyInSpace) {
             return new int[] { mSpaceKeyIndex };
         } else {
-            return super.getNearestKeys(x, y);
+            // Avoid dead pixels at edges of the keyboard
+            return super.getNearestKeys(Math.max(0, Math.min(x, getMinWidth() - 1)),
+                    Math.max(0, Math.min(y, getHeight() - 1)));
         }
     }
 
diff --git a/java/src/com/android/inputmethod/latin/ProximityKeyDetector.java b/java/src/com/android/inputmethod/latin/ProximityKeyDetector.java
index d17bedb56..325ce674c 100644
--- a/java/src/com/android/inputmethod/latin/ProximityKeyDetector.java
+++ b/java/src/com/android/inputmethod/latin/ProximityKeyDetector.java
@@ -83,4 +83,4 @@ class ProximityKeyDetector extends KeyDetector {
         }
         return primaryIndex;
     }
-}
\ No newline at end of file
+}