diff --git a/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileDialog.java b/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileDialog.java
index 8c5871a52969..ecd4adbde004 100644
--- a/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileDialog.java
+++ b/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileDialog.java
@@ -208,6 +208,7 @@ public class CreateResourceFileDialog extends DialogWrapper {
                                  : "");
       myRootElementFieldWrapper.removeAll();
       myRootElementFieldWrapper.add(myRootElementField, BorderLayout.CENTER);
+      myRootElementLabel.setLabelFor(myRootElementField);
     }
   }
 
diff --git a/plugins/android/src/org/jetbrains/android/uipreview/DeviceConfiguratorPanel.java b/plugins/android/src/org/jetbrains/android/uipreview/DeviceConfiguratorPanel.java
index 13dfce4377ff..edb4b219d40a 100644
--- a/plugins/android/src/org/jetbrains/android/uipreview/DeviceConfiguratorPanel.java
+++ b/plugins/android/src/org/jetbrains/android/uipreview/DeviceConfiguratorPanel.java
@@ -340,16 +340,18 @@ public abstract class DeviceConfiguratorPanel extends JPanel {
     final JPanel leftPanel = new JPanel(new BorderLayout(5, 5));
     myAvailableQualifiersList = new JBList();
     myAvailableQualifiersList.setMinimumSize(new Dimension(10, 10));
-    leftPanel
-      .add(new JBLabel(AndroidBundle.message("android.layout.preview.edit.configuration.available.qualifiers.label")), BorderLayout.NORTH);
+    JBLabel label = new JBLabel(AndroidBundle.message("android.layout.preview.edit.configuration.available.qualifiers.label"));
+    label.setLabelFor(myAvailableQualifiersList);
+    leftPanel.add(label, BorderLayout.NORTH);
     leftPanel.add(new JBScrollPane(myAvailableQualifiersList, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
                                    ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER), BorderLayout.CENTER);
 
     final JPanel rightPabel = new JPanel(new BorderLayout(5, 5));
     myChosenQualifiersList = new JBList();
     myChosenQualifiersList.setMinimumSize(new Dimension(10, 10));
-    rightPabel
-      .add(new JBLabel(AndroidBundle.message("android.layout.preview.edit.configuration.choosen.qualifiers.label")), BorderLayout.NORTH);
+    label = new JBLabel(AndroidBundle.message("android.layout.preview.edit.configuration.choosen.qualifiers.label"));
+    label.setLabelFor(myChosenQualifiersList);
+    rightPabel.add(label, BorderLayout.NORTH);
     rightPabel.add(new JBScrollPane(myChosenQualifiersList, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
                                     ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER), BorderLayout.CENTER);