diff --git a/java/src/com/android/inputmethod/latin/SuggestionsView.java b/java/src/com/android/inputmethod/latin/SuggestionsView.java
index b00036b..13beb44 100644
--- a/java/src/com/android/inputmethod/latin/SuggestionsView.java
+++ b/java/src/com/android/inputmethod/latin/SuggestionsView.java
@@ -808,11 +808,10 @@
         final int translatedY = moreKeysPanel.translateY(y);
 
         if (mCheckingIfModalOrSlidingMode) {
-            final int deltaX = Math.abs(x - mOriginX);
-            final int deltaY = Math.abs(y - mOriginY);
-            if (deltaX >= mMoreSuggestionsModalTolerance
-                    || deltaY >= mMoreSuggestionsModalTolerance) {
-                // Decided to be in the sliding input mode
+            if (Math.abs(x - mOriginX) >= mMoreSuggestionsModalTolerance
+                    || mOriginY - y >= mMoreSuggestionsModalTolerance) {
+                // Decided to be in the sliding input mode only when the touch point has been moved
+                // upward.
                 mCheckingIfModalOrSlidingMode = false;
                 tracker.onShowMoreKeysPanel(
                         translatedX, translatedY, SystemClock.uptimeMillis(), moreKeysPanel);
