diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
index 4172471be0de..2b65a17cf598 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
@@ -339,7 +339,9 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
       if (patchReader == null) return;
 
       List<FilePatch> filePatches = ContainerUtil.<FilePatch>newArrayList(patchReader.getPatches());
-      filePatches.addAll(myBinaryShelvedPatches);
+      if (!ContainerUtil.isEmpty(myBinaryShelvedPatches)) {
+        filePatches.addAll(myBinaryShelvedPatches);
+      }
       final List<AbstractFilePatchInProgress> matchedPatches = new MatchPatchPaths(myProject).execute(filePatches);
 
       ApplicationManager.getApplication().invokeLater(new Runnable() {