diff --git a/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.java b/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.java
index 2acb3e9a01c8..c40f66ff5189 100644
--- a/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.java
+++ b/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.java
@@ -399,6 +399,9 @@ public class CreateXmlResourceDialog extends DialogWrapper {
     else if (myValueField.isVisible()) {
       return myValueField;
     }
+    else if (myModuleCombo.isVisible()) {
+      return myModuleCombo;
+    }
     else {
       return myFileNameField;
     }