diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java b/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java
index 29e682d8cd5..a20631a32db 100644
--- a/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java
+++ b/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java
@@ -9,6 +9,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.IdentityHashMap;
 import java.util.Iterator;
@@ -122,6 +123,17 @@ private void addPackage(Map<String, JPackage> pkgs, JPackage pkg) {
 		}
 	}
 
+	public JClass searchClassInTree(JClass node) {
+		Enumeration en = this.breadthFirstEnumeration();
+		while (en.hasMoreElements()) {
+			Object obj = en.nextElement();
+			if (node.equals(obj)) {
+				return (JClass) obj;
+			}
+		}
+		return null;
+	}
+
 	public boolean isFlatPackages() {
 		return flatPackages;
 	}
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java b/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
index fe43a8023b3..ca617be812d 100644
--- a/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
+++ b/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
@@ -76,6 +76,7 @@ public class MainWindow extends JFrame {
 
 	private JTree tree;
 	private DefaultTreeModel treeModel;
+	private JRoot treeRoot;
 	private TabbedPane tabbedPane;
 
 	public MainWindow(JadxWrapper wrapper) {
@@ -116,7 +117,7 @@ private void saveAllAction() {
 	}
 
 	private void initTree() {
-		JRoot treeRoot = new JRoot(wrapper);
+		treeRoot = new JRoot(wrapper);
 		treeModel.setRoot(treeRoot);
 		treeModel.reload();
 		tree.expandRow(0);
@@ -152,13 +153,20 @@ private void syncWithEditor() {
 			return;
 		}
 		JClass jCls = selectedCodePanel.getCls();
+		if (jCls.getParent() == null && treeRoot != null) {
+			// node not register in tree
+			jCls = treeRoot.searchClassInTree(jCls);
+			if (jCls == null) {
+				LOG.error("Class not found in tree");
+				return;
+			}
+		}
 		TreeNode[] pathNodes = treeModel.getPathToRoot(jCls);
 		if (pathNodes == null) {
 			return;
 		}
 		TreePath path = new TreePath(pathNodes);
 		tree.setSelectionPath(path);
-		tree.expandPath(path);
 		tree.makeVisible(path);
 	}