1 files changed, 1 insertions, 1 deletions
diff --git a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/KeyboardComboSwitcher.java b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/KeyboardComboSwitcher.java
index 99ac9f7ec586..232ddd7bec3b 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/KeyboardComboSwitcher.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/KeyboardComboSwitcher.java
@@ -28,7 +28,7 @@ public class KeyboardComboSwitcher {
         if (toggleStrategy) {
           final int size = comboBox.getModel().getSize();
           int next = comboBox.getSelectedIndex() + 1;
-          if (next < 0 || next >= size) {
+          if (size > 0 && (next < 0 || next >= size)) {
             if (!UISettings.getInstance().CYCLE_SCROLLING) {
               return;
             }