diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
index 3075598883e6..f71fe2f80211 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
@@ -389,6 +389,7 @@ public abstract class DialogWrapper {
     return DialogWrapperPeerFactory.getInstance().createPeer(this, project, canBeParent);
   }
 
+  @Nullable
   protected JComponent createTitlePane() {
     return null;
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java
index b2150bd09628..31dbdcdc2079 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java
@@ -15,6 +15,7 @@ import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.TitlePanel;
 import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.UIBundle;
@@ -26,6 +27,7 @@ import com.intellij.util.ui.update.UiNotifyConnector;
 import com.intellij.util.ui.update.Update;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
@@ -126,8 +128,15 @@ public class FileChooserDialogImpl extends DialogWrapper implements FileChooserD
     syncAction.registerCustomShortcutSet(original.getShortcutSet(), tree, myDisposable);
   }
 
+  @Nullable
   protected final JComponent createTitlePane() {
-    return new TitlePanel(myChooserDescriptor.getTitle(), myChooserDescriptor.getDescription());
+    final String title = myChooserDescriptor.getTitle();
+    final String description = myChooserDescriptor.getDescription();
+    if ((StringUtil.isEmptyOrSpaces(title) || title.equals(UIBundle.message("file.chooser.default.title"))) &&
+        StringUtil.isEmptyOrSpaces(description)) {
+      return null;
+    }
+    return new TitlePanel(title, description);
   }
 
   protected JComponent createCenterPanel() {