diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerExpressionComboBox.java b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerExpressionComboBox.java
index c57205e6e981..c26f8533deda 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerExpressionComboBox.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerExpressionComboBox.java
@@ -61,7 +61,9 @@ public class DebuggerExpressionComboBox extends DebuggerEditorImpl {
       if (twi != null) {
         restoreFactory(twi);
       }
-      super.setItem(createDocument(twi));
+      final Document document = createDocument(twi);
+      getEditorComponent().setNewDocumentAndFileType(getCurrentFactory().getFileType(), document);
+      super.setItem(document);
       /* Causes PSI being modified from PSI events. See IDEADEV-22102
       final Editor editor = getEditor();
       if (editor != null) {
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerExpressionTextField.java b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerExpressionTextField.java
index aa62b286c03a..8dbdb3d39cdc 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerExpressionTextField.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerExpressionTextField.java
@@ -64,7 +64,7 @@ public class DebuggerExpressionTextField extends DebuggerEditorImpl {
   @Override
   protected void doSetText(TextWithImports text) {
     restoreFactory(text);
-    myEditor.setDocument(createDocument(text));
+    myEditor.setNewDocumentAndFileType(getCurrentFactory().getFileType(), createDocument(text));
   }
 
   @Override
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerStatementEditor.java b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerStatementEditor.java
index e13accdb05bb..a1fef7a2a543 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerStatementEditor.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerStatementEditor.java
@@ -130,7 +130,7 @@ public class DebuggerStatementEditor extends DebuggerEditorImpl {
   @Override
   protected void doSetText(TextWithImports text) {
     restoreFactory(text);
-    myEditor.setDocument(createDocument(text));
+    myEditor.setNewDocumentAndFileType(getCurrentFactory().getFileType(), createDocument(text));
   }
 
   @Override
diff --git a/platform/platform-impl/src/com/intellij/ui/EditorComboBoxEditor.java b/platform/platform-impl/src/com/intellij/ui/EditorComboBoxEditor.java
index e6bc3773a307..2b9dce102509 100644
--- a/platform/platform-impl/src/com/intellij/ui/EditorComboBoxEditor.java
+++ b/platform/platform-impl/src/com/intellij/ui/EditorComboBoxEditor.java
@@ -23,7 +23,6 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.awt.*;
 import java.awt.event.ActionListener;
 
 /**
@@ -49,7 +48,7 @@ public class EditorComboBoxEditor implements ComboBoxEditor{
     return myTextField.getEditor();
   }
 
-  public Component getEditorComponent() {
+  public EditorTextField getEditorComponent() {
     return myTextField;
   }