diff --git a/src/calibre/gui2/viewer/highlights.py b/src/calibre/gui2/viewer/highlights.py
index 05fe825139..296819feae 100644
--- a/src/calibre/gui2/viewer/highlights.py
+++ b/src/calibre/gui2/viewer/highlights.py
@@ -249,7 +249,6 @@ class Highlights(QTreeWidget):
         return self.num_of_items
 
     def find_query(self, query):
-        cr = self.currentRow()
         pat = query.regex
         items = tuple(self.iteritems())
         count = len(items)
@@ -257,7 +256,8 @@ class Highlights(QTreeWidget):
         ch = self.current_highlight
         if ch:
             q = ch['uuid']
-            for i, h in enumerate(items):
+            for i, item in enumerate(items):
+                h = item.data(0, Qt.UserRole)
                 if h['uuid'] == q:
                     cr = i
         if query.backwards: