2 files changed, 15 insertions, 2 deletions
diff --git a/src/css/match.nim b/src/css/match.nim
index 51dd9a6e..695f2404 100644
--- a/src/css/match.nim
+++ b/src/css/match.nim
@@ -77,6 +77,12 @@ func pseudoSelectorMatches(element: Element; sel: Selector;
     return element.parentNode.firstElementChild == element and
       element.parentNode.lastElementChild == element
   of pcHover:
+    #TODO this is somewhat problematic.
+    # e.g. if there is a rule like ".class :hover", then you set
+    # dtHover for basically every element, even if most of them are not
+    # a .class descendant.
+    # Ideally we should try to match the rest of the selector before
+    # attaching dependencies in general.
     depends.add(element, dtHover)
     return element.hover
   of pcRoot: return element == element.document.documentElement
diff --git a/src/server/buffer.nim b/src/server/buffer.nim
index 846191a7..41b1ec1e 100644
--- a/src/server/buffer.nim
+++ b/src/server/buffer.nim
@@ -893,10 +893,10 @@ proc updateHover*(buffer: Buffer; cursorx, cursory: int): UpdateHoverResult
   let prevNode = buffer.prevHover
   if thisNode != prevNode and (thisNode == nil or prevNode == nil or
       thisNode != prevNode):
+    var oldHover: seq[Element] = @[]
     for element in prevNode.branchElems:
       if element.hover:
-        element.setHover(false)
-        repaint = true
+        oldHover.add(element)
     for ht in HoverType:
       let s = HoverFun[ht](buffer, thisNode)
       if buffer.hoverText[ht] != s:
@@ -906,6 +906,13 @@ proc updateHover*(buffer: Buffer; cursorx, cursory: int): UpdateHoverResult
       if not element.hover:
         element.setHover(true)
         repaint = true
+      elif (let i = oldHover.find(element); i != -1):
+        # branches converged
+        oldHover.setLen(i)
+        break
+    for element in oldHover:
+      element.setHover(false)
+      repaint = true
   if repaint:
     buffer.reshape()
   buffer.prevHover = thisNode