diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java
index 24e47c06b7ce..cbddd43253b5 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java
@@ -261,7 +261,7 @@ public final class TypedHandler extends TypedActionHandlerBase {
         }
       }
       finally {
-        editor.putUserData(CompletionPhase.AUTO_POPUP_TYPED_EVENT, null);
+        setTypedEvent(editor, charTyped, null);
       }
     });
   }