diff --git a/library/src/main/java/com/tokenautocomplete/TokenCompleteTextView.java b/library/src/main/java/com/tokenautocomplete/TokenCompleteTextView.java
index c9be38a8..a834276e 100644
--- a/library/src/main/java/com/tokenautocomplete/TokenCompleteTextView.java
+++ b/library/src/main/java/com/tokenautocomplete/TokenCompleteTextView.java
@@ -1479,6 +1479,10 @@ public void onRestoreInstanceState(Parcelable state) {
         SavedState ss = (SavedState) state;
         super.onRestoreInstanceState(ss.getSuperState());
 
+        char sentinel = splitChar[0];
+        String text = getText().toString();
+        String uncompletedToken = text.substring(text.lastIndexOf(sentinel) + 1).trim();
+
         setText(ss.prefix);
         prefix = ss.prefix;
         updateHint();
@@ -1498,7 +1502,13 @@ public void onRestoreInstanceState(Parcelable state) {
         }
 
         for (T obj: objects) {
-            addObject(obj);
+            CharSequence token = obj.toString();
+            if (uncompletedToken.equals(token)) {
+                getText().append(token);
+                setSelection(token.length());
+            } else {
+                addObject(obj);
+            }
         }
 
         // Collapse the view if necessary