diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 5909b3b..d0d0b72 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1627,7 +1627,6 @@
             return;
         }
 
-        TextEntryState.acceptedSuggestion(suggestions.getWord(0), suggestion);
         // If this is a punctuation, apply it through the normal key press
         if (suggestion.length() == 1 && (isWordSeparator(suggestion.charAt(0))
                 || isSuggestedPunctuation(suggestion.charAt(0)))) {
diff --git a/java/src/com/android/inputmethod/latin/TextEntryState.java b/java/src/com/android/inputmethod/latin/TextEntryState.java
index 7b629e3..a4e0b35 100644
--- a/java/src/com/android/inputmethod/latin/TextEntryState.java
+++ b/java/src/com/android/inputmethod/latin/TextEntryState.java
@@ -107,6 +107,7 @@
             break;
         case ACCEPTED_DEFAULT:
         case SPACE_AFTER_PICKED:
+        case PUNCTUATION_AFTER_ACCEPTED:
             if (isSpace) {
                 setState(SPACE_AFTER_ACCEPTED);
             } else if (isSeparator) {
@@ -130,7 +131,6 @@
         case START:
         case UNKNOWN:
         case SPACE_AFTER_ACCEPTED:
-        case PUNCTUATION_AFTER_ACCEPTED:
         case PUNCTUATION_AFTER_WORD:
             if (!isSpace && !isSeparator) {
                 setState(IN_WORD);