diff --git a/jadx-gui/src/main/java/jadx/gui/utils/search/StringRef.java b/jadx-gui/src/main/java/jadx/gui/utils/search/StringRef.java
index d22fe3d61..a2258b842 100644
--- a/jadx-gui/src/main/java/jadx/gui/utils/search/StringRef.java
+++ b/jadx-gui/src/main/java/jadx/gui/utils/search/StringRef.java
@@ -140,6 +140,10 @@ public class StringRef implements CharSequence {
 		return list;
 	}
 
+	public int getOffset() {
+		return offset;
+	}
+
 	public int hashCode() {
 		int h = hash;
 		int len = length;
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/search/TextSearchIndex.java b/jadx-gui/src/main/java/jadx/gui/utils/search/TextSearchIndex.java
index 307e2bfb8..75b32585a 100644
--- a/jadx-gui/src/main/java/jadx/gui/utils/search/TextSearchIndex.java
+++ b/jadx-gui/src/main/java/jadx/gui/utils/search/TextSearchIndex.java
@@ -91,7 +91,7 @@ public class TextSearchIndex {
 				JavaNode node = linesInfo.getJavaNodeByLine(lineNum);
 				JavaNode javaNode = node == null ? cls : node;
 				JNode nodeAtLine = nodeCache.makeFrom(javaNode);
-				codeIndex.put(new CodeNode(nodeAtLine, line, lineNum, javaNode.getDefPos()));
+				codeIndex.put(new CodeNode(nodeAtLine, line, lineNum, line.getOffset()));
 			}
 		} catch (Exception e) {
 			LOG.warn("Failed to index class: {}", cls, e);