diff --git a/platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacroManager.java b/platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacroManager.java
index edae80b1eb62..0d5ad9ab02a0 100644
--- a/platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacroManager.java
+++ b/platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacroManager.java
@@ -96,21 +96,20 @@ public class ActionMacroManager implements ExportableApplicationComponent, Named
     myActionManager = actionManagerEx;
     myActionManager.addAnActionListener(new AnActionListener() {
       public void beforeActionPerformed(AnAction action, DataContext dataContext, final AnActionEvent event) {
-        if (myIsRecording) {
-          String id = myActionManager.getId(action);
-          //noinspection HardCodedStringLiteral
-          if (id != null && !"StartStopMacroRecording".equals(id)) {
-            myRecordingMacro.appendAction(id);
-            String shortcut = null;
-            if (event.getInputEvent() instanceof KeyEvent) {
-              shortcut = KeymapUtil.getKeystrokeText(KeyStroke.getKeyStrokeForEvent((KeyEvent)event.getInputEvent()));
-            }
-            notifyUser(id + (shortcut != null ? " (" + shortcut + ")" : ""), false);
-          }
-
-          if (id != null) {
-            myLastActionInputEvent.add(event.getInputEvent());
+        String id = myActionManager.getId(action);
+        if (id == null) return;
+        //noinspection HardCodedStringLiteral
+        if ("StartStopMacroRecording".equals(id)) {
+          myLastActionInputEvent.add(event.getInputEvent());
+        }
+        else if (myIsRecording) {
+          myRecordingMacro.appendAction(id);
+          String shortcut = null;
+          if (event.getInputEvent() instanceof KeyEvent) {
+            shortcut = KeymapUtil.getKeystrokeText(KeyStroke.getKeyStrokeForEvent((KeyEvent)event.getInputEvent()));
           }
+          notifyUser(id + (shortcut != null ? " (" + shortcut + ")" : ""), false);
+          myLastActionInputEvent.add(event.getInputEvent());
         }
       }