diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
index 554f04c6b22c..3550a712e443 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
@@ -1069,8 +1069,8 @@ public abstract class ChooseByNameBase {
 
     @Override
     public void removeRangeFromModel(int start, int end) {
-      if (start < size()) {
-        removeRange(start, Math.min(end, size()));
+      if (start < size() && size() != 0) {
+        removeRange(start, Math.min(end, size()-1));
       }
     }
   }