diff --git a/samples/AutofillKeyboard/src/com/example/android/autofillkeyboard/AutofillImeService.java b/samples/AutofillKeyboard/src/com/example/android/autofillkeyboard/AutofillImeService.java
index 2a4714777..625302178 100644
--- a/samples/AutofillKeyboard/src/com/example/android/autofillkeyboard/AutofillImeService.java
+++ b/samples/AutofillKeyboard/src/com/example/android/autofillkeyboard/AutofillImeService.java
@@ -144,7 +144,8 @@ public class AutofillImeService extends InputMethodService {
         Log.d(TAG, "updateSuggestionViews() called");
         mSuggestionViews = Arrays.asList(suggestionViews);
         mSuggestionViewSizes = Arrays.asList(sizes);
-        updateInlineSuggestionVisibility(true, true);
+        final boolean visible = !mSuggestionViews.isEmpty();
+        updateInlineSuggestionVisibility(visible, true);
     }
 
     private void onInlineSuggestionsResponseInternal(InlineSuggestionsResponse response) {
@@ -157,6 +158,10 @@ public class AutofillImeService extends InputMethodService {
         final View[] suggestionViews = new View[totalSuggestionsCount];
         final Size[] sizes = new Size[totalSuggestionsCount];
 
+        if (totalSuggestionsCount == 0) {
+            updateSuggestionViews(suggestionViews, sizes);
+            return;
+        }
         for (int i=0; i<totalSuggestionsCount; i++) {
             final int index = i;
             InlineSuggestion inlineSuggestion = inlineSuggestions.get(index);
@@ -183,7 +188,6 @@ public class AutofillImeService extends InputMethodService {
 
     void handle(String data) {
         Log.d(TAG, "handle() called: [" + data + "]");
-        mDecoder.decode(data);
-        updateInlineSuggestionVisibility(mDecoder.isEmpty(), false);
+        mDecoder.decodeAndApply(data);
     }
 }
diff --git a/samples/AutofillKeyboard/src/com/example/android/autofillkeyboard/Decoder.java b/samples/AutofillKeyboard/src/com/example/android/autofillkeyboard/Decoder.java
index 923960285..222d18163 100644
--- a/samples/AutofillKeyboard/src/com/example/android/autofillkeyboard/Decoder.java
+++ b/samples/AutofillKeyboard/src/com/example/android/autofillkeyboard/Decoder.java
@@ -28,7 +28,7 @@ final class Decoder {
         this.mInputConnection = inputConnection;
     }
 
-    void decode(String data) {
+    void decodeAndApply(String data) {
         if ("DEL".equals(data)) {
             mInputConnection.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL));
         } else if ("ENT".equals(data)) {