diff --git a/platform/diff-api/src/com/intellij/ide/diff/DirDiffSettings.java b/platform/diff-api/src/com/intellij/ide/diff/DirDiffSettings.java
index 3e4a9ba6fdd9..33090403bc55 100644
--- a/platform/diff-api/src/com/intellij/ide/diff/DirDiffSettings.java
+++ b/platform/diff-api/src/com/intellij/ide/diff/DirDiffSettings.java
@@ -16,6 +16,7 @@
 package com.intellij.ide.diff;
 
 import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.PatternUtil;
 import org.jetbrains.annotations.NotNull;
@@ -30,6 +31,8 @@ import java.util.regex.Pattern;
  * @author Konstantin Bulenkov
  */
 public class DirDiffSettings {
+  public static final Key<DirDiffSettings> KEY = Key.create("Diff.DirDiffSettings");
+
   public boolean showSize = true;
   public boolean showDate = true;
 
diff --git a/platform/diff-impl/src/com/intellij/diff/tools/dir/DirDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/dir/DirDiffViewer.java
index fc1f45cee992..35ac23624522 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/dir/DirDiffViewer.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/dir/DirDiffViewer.java
@@ -40,6 +40,7 @@ import com.intellij.openapi.diff.impl.dir.DirDiffWindow;
 import com.intellij.openapi.project.DefaultProjectFactory;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
+import com.intellij.util.ObjectUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -69,7 +70,8 @@ class DirDiffViewer implements FrameDiffTool.DiffViewer {
     Project project = context.getProject();
     if (project == null) project = DefaultProjectFactory.getInstance().getDefaultProject();
 
-    DirDiffTableModel model = new DirDiffTableModel(project, element1, element2, new DirDiffSettings());
+    DirDiffSettings settings = ObjectUtils.notNull(context.getUserData(DirDiffSettings.KEY), new DirDiffSettings());
+    DirDiffTableModel model = new DirDiffTableModel(project, element1, element2, settings);
 
     myDirDiffPanel = new DirDiffPanel(model, new DirDiffWindow((DirDiffFrame)null) {
       @Override