diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeArea.java b/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeArea.java
index a86a08a59..222c42120 100644
--- a/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeArea.java
+++ b/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeArea.java
@@ -92,7 +92,6 @@ public abstract class AbstractCodeArea extends RSyntaxTextArea {
 
 		JadxSettings settings = contentPanel.getTabbedPane().getMainWindow().getSettings();
 		setLineWrap(settings.isCodeAreaLineWrap());
-		addWrapLineMenuAction(settings);
 
 		ZoomActions.register(this, settings, this::loadSettings);
 
@@ -135,6 +134,7 @@ public abstract class AbstractCodeArea extends RSyntaxTextArea {
 			menu.add(createPopupMenuItem(getAction(SELECT_ALL_ACTION)));
 		}
 		appendFoldingMenu(menu);
+		appendWrapLineMenu(menu);
 		return menu;
 	}
 
@@ -146,8 +146,8 @@ public abstract class AbstractCodeArea extends RSyntaxTextArea {
 		}
 	}
 
-	private void addWrapLineMenuAction(JadxSettings settings) {
-		JPopupMenu popupMenu = getPopupMenu();
+	private void appendWrapLineMenu(JPopupMenu popupMenu) {
+		JadxSettings settings = contentPanel.getTabbedPane().getMainWindow().getSettings();
 		popupMenu.addSeparator();
 		JCheckBoxMenuItem wrapItem = new JCheckBoxMenuItem(NLS.str("popup.line_wrap"), getLineWrap());
 		wrapItem.setAction(new AbstractAction(NLS.str("popup.line_wrap")) {
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeArea.java b/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeArea.java
index da0328d0d..d11737857 100644
--- a/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeArea.java
+++ b/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeArea.java
@@ -6,6 +6,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.Objects;
 
+import javax.swing.JPopupMenu;
 import javax.swing.event.PopupMenuEvent;
 
 import org.fife.ui.rsyntaxtextarea.RSyntaxDocument;
@@ -53,7 +54,6 @@ public final class CodeArea extends AbstractCodeArea {
 		boolean isJavaCode = node instanceof JClass;
 		if (isJavaCode) {
 			((RSyntaxDocument) getDocument()).setSyntaxStyle(new JadxTokenMaker(this));
-			addMenuItems();
 		}
 
 		if (node instanceof JResource && node.makeString().endsWith(".json")) {
@@ -118,9 +118,18 @@ public final class CodeArea extends AbstractCodeArea {
 		setText(getCodeInfo().getCodeStr());
 	}
 
-	private void addMenuItems() {
+	@Override
+	protected JPopupMenu createPopupMenu() {
+		JPopupMenu popup = super.createPopupMenu();
+		if (node instanceof JClass) {
+			appendCodeMenuItems(popup);
+		}
+		return popup;
+	}
+
+	private void appendCodeMenuItems(JPopupMenu popupMenu) {
 		ShortcutsController shortcutsController = getMainWindow().getShortcutsController();
-		JNodePopupBuilder popup = new JNodePopupBuilder(this, getPopupMenu(), shortcutsController);
+		JNodePopupBuilder popup = new JNodePopupBuilder(this, popupMenu, shortcutsController);
 		popup.addSeparator();
 		popup.add(new FindUsageAction(this));
 		popup.add(new GoToDeclarationAction(this));
@@ -133,7 +142,7 @@ public final class CodeArea extends AbstractCodeArea {
 		getMainWindow().getWrapper().getGuiPluginsContext().appendPopupMenus(this, popup);
 
 		// move caret on mouse right button click
-		popup.getMenu().addPopupMenuListener(new DefaultPopupMenuListener() {
+		popupMenu.addPopupMenuListener(new DefaultPopupMenuListener() {
 			@Override
 			public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
 				CodeArea codeArea = CodeArea.this;