diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/EditAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/EditAction.java
index 9923d27ff256..78f2c0e87f02 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/EditAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/EditAction.java
@@ -16,10 +16,9 @@
 
 package com.intellij.openapi.vcs.changes.actions;
 
-import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
-import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.*;
 import com.intellij.openapi.vcs.changes.ChangesUtil;
@@ -30,7 +29,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import java.util.ArrayList;
 import java.util.List;
 
-public class EditAction extends AnAction {
+public class EditAction extends DumbAwareAction {
   public void actionPerformed(AnActionEvent e) {
     final Project project = e.getData(CommonDataKeys.PROJECT);
     List<VirtualFile> files = e.getData(VcsDataKeys.MODIFIED_WITHOUT_EDITING_DATA_KEY);
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoreUnversionedAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoreUnversionedAction.java
index 3aabcdb616c0..ed732eb6da40 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoreUnversionedAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoreUnversionedAction.java
@@ -16,9 +16,9 @@
 
 package com.intellij.openapi.vcs.changes.actions;
 
-import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.ui.IgnoreUnversionedDialog;
@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
 import static com.intellij.openapi.vcs.changes.ui.ChangesListView.UNVERSIONED_FILES_DATA_KEY;
 import static com.intellij.util.containers.UtilKt.isEmpty;
 
-public class IgnoreUnversionedAction extends AnAction {
+public class IgnoreUnversionedAction extends DumbAwareAction {
 
   public void actionPerformed(@NotNull AnActionEvent e) {
     Project project = e.getRequiredData(CommonDataKeys.PROJECT);
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RenameShelvedChangeListAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RenameShelvedChangeListAction.java
index b841b9f638a1..62449ab59f73 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RenameShelvedChangeListAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RenameShelvedChangeListAction.java
@@ -15,16 +15,16 @@
  */
 package com.intellij.openapi.vcs.changes.shelf;
 
-import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.ObjectUtils;
 import com.intellij.util.containers.ContainerUtil;
 
 import java.util.List;
 
-public class RenameShelvedChangeListAction extends AnAction {
+public class RenameShelvedChangeListAction extends DumbAwareAction {
   public void actionPerformed(AnActionEvent e) {
     final Project project = e.getRequiredData(CommonDataKeys.PROJECT);
     final List<ShelvedChangeList> changelists = ShelvedChangesViewManager.getShelvedLists(e.getDataContext());
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RestoreShelvedChange.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RestoreShelvedChange.java
index 226839978f65..177969275379 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RestoreShelvedChange.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RestoreShelvedChange.java
@@ -15,14 +15,13 @@
  */
 package com.intellij.openapi.vcs.changes.shelf;
 
-import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
-import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.VcsBundle;
 
-public class RestoreShelvedChange extends AnAction {
+public class RestoreShelvedChange extends DumbAwareAction {
   public RestoreShelvedChange() {
     super("Restore");
   }
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractFilesAction.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractFilesAction.java
index ff6f45fb435d..597bcbecb670 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractFilesAction.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractFilesAction.java
@@ -12,9 +12,13 @@
 // limitations under the License.
 package org.zmlx.hg4idea.action;
 
-import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.AbstractVcsHelper;
 import com.intellij.openapi.vcs.ProjectLevelVcsManager;
@@ -28,7 +32,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.LinkedList;
 import java.util.List;
 
-abstract class HgAbstractFilesAction extends AnAction {
+abstract class HgAbstractFilesAction extends DumbAwareAction {
 
   private static final Logger LOG = Logger.getInstance(HgAbstractGlobalAction.class.getName());