diff --git a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/StringPropertyCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/StringPropertyCodeGenerator.java
index b730fee8e584..a46c0294baf7 100644
--- a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/StringPropertyCodeGenerator.java
+++ b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/StringPropertyCodeGenerator.java
@@ -70,10 +70,6 @@ public final class StringPropertyCodeGenerator extends PropertyCodeGenerator imp
                                         GetFontMethodProvider fontMethodProvider,
                                         final int componentLocal,
                                         final String formClassName) throws IOException, ClassNotFoundException {
-    if (!"text".equals(property.getName())) {
-      return false;
-    }
-    
     StringDescriptor propertyValue = (StringDescriptor)lwComponent.getPropertyValue(property);
     String key = propertyValue.getKey();
 
@@ -81,6 +77,10 @@ public final class StringPropertyCodeGenerator extends PropertyCodeGenerator imp
       propertyValue.setFormClass(formClassName);
     }
 
+    if (!"text".equals(property.getName())) {
+      return false;
+    }
+
     InstrumentationClassFinder.PseudoClass abstractButtonClass = componentClass.getFinder().loadClass(AbstractButton.class.getName());
     InstrumentationClassFinder.PseudoClass jLabelClass = componentClass.getFinder().loadClass(JLabel.class.getName());
     if (!(abstractButtonClass.isAssignableFrom(componentClass) || jLabelClass.isAssignableFrom(componentClass))) {
diff --git a/plugins/ui-designer/testData/TestTitledSeparator.form b/plugins/ui-designer/testData/TestTitledSeparator.form
index 29f2a9cb1479..3db51521655d 100644
--- a/plugins/ui-designer/testData/TestTitledSeparator.form
+++ b/plugins/ui-designer/testData/TestTitledSeparator.form
@@ -26,6 +26,7 @@
         </constraints>
         <properties>
           <text resource-bundle="com/intellij/uiDesigner/core/TestProperties" key="test"/>
+          <toolTipText resource-bundle="com/intellij/uiDesigner/core/TestProperties" key="test"/>
         </properties>
       </component>
     </children>
diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java
index f95bdcffd1c6..aa01c63a29d4 100644
--- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java
+++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java
@@ -365,6 +365,7 @@ public class AsmCodeGeneratorTest extends JpsBuildTestCase {
   public void testTitledSeparator() throws Exception {
     JPanel panel = (JPanel)getInstrumentedRootComponent("TestTitledSeparator.form", "BindingTest");
     assertEquals("Test Value", ((JLabel)((JPanel)panel.getComponent(2)).getComponent(0)).getText());
+    assertEquals("Test Value", ((JPanel)panel.getComponent(2)).getToolTipText());
   }
 
   public void testGotItPanel() throws Exception {