diff --git a/platform/platform-resources/src/META-INF/XmlPlugin.xml b/platform/platform-resources/src/META-INF/XmlPlugin.xml
index 66cd50025493..dca03e9be781 100644
--- a/platform/platform-resources/src/META-INF/XmlPlugin.xml
+++ b/platform/platform-resources/src/META-INF/XmlPlugin.xml
@@ -218,7 +218,7 @@
 
     <xml.zenCodingGenerator implementation="com.intellij.codeInsight.template.emmet.generators.XmlZenCodingGeneratorImpl" order="last"/>
     <customLiveTemplate implementation="com.intellij.codeInsight.template.emmet.ZenCodingTemplate"/>
-    <typedHandler implementation="com.intellij.codeInsight.template.emmet.EmmetPreviewTypedHandler"/>
+    <editorTypedHandler implementationClass="com.intellij.codeInsight.template.emmet.EmmetPreviewTypedHandler" id="emmetPreview"/>
     <lookup.actionProvider implementation="com.intellij.codeInsight.template.emmet.completion.EmmetLookupActionProvider"/>
 
     <externalAnnotator language="XML" implementationClass="com.intellij.lang.xml.XMLExternalAnnotator"/>
diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetPreviewTypedHandler.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetPreviewTypedHandler.java
index b17ad8742fd6..f53c968619f8 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetPreviewTypedHandler.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetPreviewTypedHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,18 +16,32 @@
 package com.intellij.codeInsight.template.emmet;
 
 import com.intellij.application.options.emmet.EmmetOptions;
-import com.intellij.codeInsight.editorActions.TypedHandlerDelegate;
+import com.intellij.codeInsight.template.impl.editorActions.TypedActionHandlerBase;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.actionSystem.TypedActionHandler;
 import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.util.PsiUtilBase;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class EmmetPreviewTypedHandler extends TypedActionHandlerBase {
+  public EmmetPreviewTypedHandler(@Nullable TypedActionHandler originalHandler) {
+    super(originalHandler);
+  }
 
-public class EmmetPreviewTypedHandler extends TypedHandlerDelegate {
   @Override
-  public Result charTyped(char c, @NotNull final Project project, @NotNull final Editor editor, @NotNull final PsiFile file) {
+  public void execute(@NotNull Editor editor, char charTyped, @NotNull DataContext dataContext) {
+    if (myOriginalHandler != null) myOriginalHandler.execute(editor, charTyped, dataContext);
     if (EmmetOptions.getInstance().isPreviewEnabled()) {
+      Project project = CommonDataKeys.PROJECT.getData(dataContext);
+      PsiFile file = project == null ? null : PsiUtilBase.getPsiFileInEditor(editor, project);
+      if (file == null) return;
+
       EmmetPreviewHint existingBalloon = EmmetPreviewHint.getExistingHint(editor);
       if (existingBalloon == null) {
         String templateText = EmmetPreviewUtil.calculateTemplateText(editor, file, false);
@@ -37,7 +51,5 @@ public class EmmetPreviewTypedHandler extends TypedHandlerDelegate {
         }
       }
     }
-
-    return super.charTyped(c, project, editor, file);
   }
 }