diff --git a/client/src/main/java/com/diridium/sourcecodesearch/SourceCodeSearchDialog.java b/client/src/main/java/com/diridium/sourcecodesearch/SourceCodeSearchDialog.java
index a7f7f97..6ca4bc5 100644
--- a/client/src/main/java/com/diridium/sourcecodesearch/SourceCodeSearchDialog.java
+++ b/client/src/main/java/com/diridium/sourcecodesearch/SourceCodeSearchDialog.java
@@ -353,7 +353,8 @@ private void buildResultTree(List<SearchMatch> matches, Pattern highlightPattern
                         rootNode.add(codeTemplatesNode);
                     }
                     DefaultMutableTreeNode tmplNode = findOrCreateChild(codeTemplatesNode, match.getChannelName());
-                    tmplNode.add(new DefaultMutableTreeNode(lineLabel));
+                    DefaultMutableTreeNode locNode = findOrCreateChild(tmplNode, match.getLocation());
+                    locNode.add(new DefaultMutableTreeNode(lineLabel));
                     break;
                 }
                 case "GLOBAL_SCRIPT": {