diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/editor/ResponseEditorPanel.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/editor/ResponseEditorPanel.java
index 5aaf8ca1..caaf28e6 100644
--- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/editor/ResponseEditorPanel.java
+++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/editor/ResponseEditorPanel.java
@@ -61,9 +61,10 @@ public class ResponseEditorPanel extends JPanel implements Disposable {
     group.add(new ReplaceCodeInMainEditorAction());
     String originalGroupId = ((EditorEx) editor).getContextMenuGroupId();
     if (originalGroupId != null) {
-      AnAction originalGroup = ActionManager.getInstance().getAction(originalGroupId);
+      ActionManager actionManager = ActionManager.getInstance();
+      AnAction originalGroup = actionManager.getAction(originalGroupId);
       if (originalGroup instanceof ActionGroup) {
-        group.addAll(((ActionGroup) originalGroup).getChildren(null));
+        group.addAll(((ActionGroup) originalGroup).getChildren(null, actionManager));
       }
     }
     configureEditor(