diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/CloseTaskDialog.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/CloseTaskDialog.java
index 3fd1662b7852..093ad46f115d 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/CloseTaskDialog.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/CloseTaskDialog.java
@@ -66,8 +66,9 @@ public class CloseTaskDialog extends DialogWrapper {
     myTaskManager = (TaskManagerImpl)TaskManager.getManager(project);
 
     if (myTaskManager.isVcsEnabled()) {
-      myCommitChanges.setEnabled(!task.getChangeLists().isEmpty());
-      myCommitChanges.setSelected(myTaskManager.getState().commitChanges);
+      boolean hasChanges = !task.getChangeLists().isEmpty();
+      myCommitChanges.setEnabled(hasChanges);
+      myCommitChanges.setSelected(hasChanges && myTaskManager.getState().commitChanges);
       if (myTaskManager.getActiveVcs().getType() == VcsType.distributed) {
         boolean enabled = !task.getBranches(true).isEmpty() && !task.getBranches(false).isEmpty();
         myMergeBranches.setEnabled(enabled);