diff --git a/gui/src/main/groovy/com/muwire/gui/ResultTreeModel.groovy b/gui/src/main/groovy/com/muwire/gui/ResultTreeModel.groovy
index c22c24a2..e5fadb4b 100644
--- a/gui/src/main/groovy/com/muwire/gui/ResultTreeModel.groovy
+++ b/gui/src/main/groovy/com/muwire/gui/ResultTreeModel.groovy
@@ -30,7 +30,7 @@ class ResultTreeModel extends DefaultTreeModel {
             def nodeData = new ResultTreeRenderer.ResultTreeNode(hiddenRoot, element)
             def elementNode = null
             for(int i = 0; i < node.childCount; i++) {
-                if (node.getChildAt(i).getUserObject() == nodeData) {
+                if (Objects.equals(node.getChildAt(i).getUserObject(), nodeData)) {
                     elementNode = node.getChildAt(i)
                     break
                 }
diff --git a/gui/src/main/groovy/com/muwire/gui/ResultTreeRenderer.groovy b/gui/src/main/groovy/com/muwire/gui/ResultTreeRenderer.groovy
index e73ac209..5c555560 100644
--- a/gui/src/main/groovy/com/muwire/gui/ResultTreeRenderer.groovy
+++ b/gui/src/main/groovy/com/muwire/gui/ResultTreeRenderer.groovy
@@ -86,8 +86,8 @@ class ResultTreeRenderer extends DefaultTreeCellRenderer {
             if (!(o instanceof ResultTreeNode))
                 return false
             ResultTreeNode other = (ResultTreeNode)o
-            hiddenRoot == other.hiddenRoot && 
-                    element == other.element
+            Objects.equals(hiddenRoot, other.hiddenRoot) &&
+                    Objects.equals(element, other.element)
         }
     }
 }