1 files changed, 3 insertions, 1 deletions
diff --git a/platform/platform-impl/src/com/intellij/ui/TableSpeedSearch.java b/platform/platform-impl/src/com/intellij/ui/TableSpeedSearch.java
index 93a9d9390d33..b596204e6ad2 100644
--- a/platform/platform-impl/src/com/intellij/ui/TableSpeedSearch.java
+++ b/platform/platform-impl/src/com/intellij/ui/TableSpeedSearch.java
@@ -55,7 +55,9 @@ public class TableSpeedSearch extends SpeedSearchBase<JTable> {
 
   @Override
   protected boolean isSpeedSearchEnabled() {
-    return !getComponent().isEditing() && super.isSpeedSearchEnabled();
+    JTable table = getComponent();
+    boolean tableIsNotEmpty = table.getRowCount() != 0 && table.getColumnCount() != 0;
+    return tableIsNotEmpty && !table.isEditing() && super.isSpeedSearchEnabled();
   }
 
   @Override