diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/CreatePatchFromChangesAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/CreatePatchFromChangesAction.java
index c1c602949edb..ef663b8f03e7 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/CreatePatchFromChangesAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/CreatePatchFromChangesAction.java
@@ -120,9 +120,10 @@ public class CreatePatchFromChangesAction extends AnAction implements DumbAware
 
   public void update(final AnActionEvent e) {
     final Boolean haveSelectedChanges = e.getData(VcsDataKeys.HAVE_SELECTED_CHANGES);
-    ChangeList[] changeLists = e.getData(VcsDataKeys.CHANGE_LISTS);
-    final String presetMessage = e.getData(VcsDataKeys.PRESET_COMMIT_MESSAGE);
+    Change[] changes;
+    ChangeList[] lists;
     e.getPresentation().setEnabled(Boolean.TRUE.equals(haveSelectedChanges) &&
-                                   ((changeLists == null || changeLists.length == 1)) || (presetMessage != null));
+                                   ((lists = e.getData(VcsDataKeys.CHANGE_LISTS)) != null && lists.length == 1) &&
+                                   ((changes = e.getData(VcsDataKeys.CHANGES)) != null && changes.length > 0));
   }
 }