diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/AbstractSelectFilesDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/AbstractSelectFilesDialog.java
index 1b4f22b038c3..933c95c13b22 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/AbstractSelectFilesDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/AbstractSelectFilesDialog.java
@@ -72,6 +72,14 @@ public abstract class AbstractSelectFilesDialog<T> extends DialogWrapper {
     super.doOKAction();
   }
 
+  @Override
+  public void doCancelAction() {
+    if (myDoNotShowCheckbox != null && myDoNotShowCheckbox.isSelected()) {
+        myConfirmationOption.setValue(VcsShowConfirmationOption.Value.DO_NOTHING_SILENTLY);
+      }
+    super.doCancelAction();
+  }
+
   @Override
   public JComponent getPreferredFocusedComponent() {
     return getFileList();
@@ -85,7 +93,7 @@ public abstract class AbstractSelectFilesDialog<T> extends DialogWrapper {
     panel.add(getFileList(), BorderLayout.CENTER);
 
     if (myShowDoNotAskOption) {
-      myDoNotShowCheckbox = new JCheckBox(CommonBundle.message("dialog.options.do.not.show"));
+      myDoNotShowCheckbox = new JCheckBox(CommonBundle.message("dialog.options.do.not.ask"));
       panel.add(myDoNotShowCheckbox, BorderLayout.SOUTH);
     }
     return panel;