diff --git a/plugins/android/src/org/jetbrains/android/run/ExtendedDeviceChooserDialog.java b/plugins/android/src/org/jetbrains/android/run/ExtendedDeviceChooserDialog.java
index ccb449ac3aa4..6dbce36086f1 100644
--- a/plugins/android/src/org/jetbrains/android/run/ExtendedDeviceChooserDialog.java
+++ b/plugins/android/src/org/jetbrains/android/run/ExtendedDeviceChooserDialog.java
@@ -95,7 +95,7 @@ public class ExtendedDeviceChooserDialog extends DialogWrapper {
     };
     myLaunchEmulatorRadioButton.addActionListener(listener);
     myChooserRunningDeviceRadioButton.addActionListener(listener);
-    myAvdCombo.addActionListener(listener);
+    myAvdCombo.getComboBox().addActionListener(listener);
 
     init();