diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/TextWithImportsImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/TextWithImportsImpl.java
index 7958cd37d0c9..9dd57b84514c 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/TextWithImportsImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/TextWithImportsImpl.java
@@ -89,7 +89,7 @@ public final class TextWithImportsImpl implements TextWithImports{
       return false;
     }
     TextWithImportsImpl item = ((TextWithImportsImpl)object);
-    return Comparing.equal(item.myText, myText) && Comparing.equal(item.myImports, myImports) && Comparing.equal(item.myFileType, myFileType);
+    return Comparing.equal(item.myText, myText) && Comparing.equal(item.myImports, myImports);
   }
 
   public String toString() {
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 71776a151836..9653a4b66bc7 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerExpressionComboBox.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerExpressionComboBox.java
@@ -130,7 +130,7 @@ public class DebuggerExpressionComboBox extends DebuggerEditorImpl {
     restoreFactory(item);
     item.setText(itemText);
     if (!"".equals(itemText)) {
-      if (myComboBox.getItemCount() == 0 || !equalLight(item, (TextWithImports)myComboBox.getItemAt(0))) {
+      if (myComboBox.getItemCount() == 0 || !item.equals(myComboBox.getItemAt(0))) {
         myComboBox.insertItemAt(item, 0);
       }
     }
@@ -141,10 +141,6 @@ public class DebuggerExpressionComboBox extends DebuggerEditorImpl {
     myComboBox.getEditor().setItem(item);
   }
 
-  private static boolean equalLight(TextWithImports item, TextWithImports second) {
-    return item.getText().equals(second.getText()) && item.getImports().equals(second.getImports());
-  }
-
   public TextWithImports getText() {
     return (TextWithImports)myComboBox.getEditor().getItem();
   }