diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/EmptyAction.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/EmptyAction.java
index b3790a0dbabe..62743c82a276 100644
--- a/platform/platform-api/src/com/intellij/openapi/actionSystem/EmptyAction.java
+++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/EmptyAction.java
@@ -93,7 +93,7 @@ public final class EmptyAction extends AnAction {
            new MyDelegatingAction(action);
   }
 
-  private static class MyDelegatingAction extends AnAction {
+  public static class MyDelegatingAction extends AnAction {
     @NotNull private final AnAction myDelegate;
 
     public MyDelegatingAction(@NotNull AnAction action) {
@@ -128,7 +128,7 @@ public final class EmptyAction extends AnAction {
     }
   }
 
-  private static class MyDelegatingActionGroup extends ActionGroup {
+  public static class MyDelegatingActionGroup extends ActionGroup {
     @NotNull private final ActionGroup myDelegate;
 
     public MyDelegatingActionGroup(@NotNull ActionGroup action) {
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/FlatSpeedSearchPopup.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/FlatSpeedSearchPopup.java
index 3e7d4e6e1b1c..6a39f4e78a7d 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/FlatSpeedSearchPopup.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/FlatSpeedSearchPopup.java
@@ -57,6 +57,11 @@ public class FlatSpeedSearchPopup extends PopupFactoryImpl.ActionGroupPopup {
     return new MySpeedSearchAction(child);
   }
 
+  @NotNull
+  public static ActionGroup createSpeedSearchActionGroupWrapper(@NotNull ActionGroup child) {
+    return new MySpeedSearchActionGroup(child);
+  }
+
   @Override
   public boolean shouldBeShowing(Object value) {
     if (!super.shouldBeShowing(value)) return false;
@@ -78,27 +83,17 @@ public class FlatSpeedSearchPopup extends PopupFactoryImpl.ActionGroupPopup {
   public interface SpeedsearchAction {
   }
 
-  private static class MySpeedSearchAction extends AnAction implements SpeedsearchAction {
-    @NotNull private final AnAction myAction;
+  private static class MySpeedSearchAction extends EmptyAction.MyDelegatingAction implements SpeedsearchAction {
 
     public MySpeedSearchAction(@NotNull AnAction action) {
-      myAction = action;
-      copyFrom(action);
+      super(action);
     }
+  }
 
-    @Override
-    public boolean isDumbAware() {
-      return myAction.isDumbAware();
-    }
-
-    @Override
-    public void update(AnActionEvent e) {
-      myAction.update(e);
-    }
-
-    @Override
-    public void actionPerformed(AnActionEvent e) {
-      myAction.actionPerformed(e);
+  private static class MySpeedSearchActionGroup extends EmptyAction.MyDelegatingActionGroup
+    implements FlatSpeedSearchPopup.SpeedsearchAction {
+    public MySpeedSearchActionGroup(@NotNull ActionGroup actionGroup) {
+      super(actionGroup);
     }
   }
 }