3 files changed, 9 insertions, 0 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 8e4e2752..b6f3b5ce 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2683,6 +2683,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
             updateSize_DocumentWidget(d);
             showOrHidePinningIndicator_DocumentWidget_(d);
             updateFetchProgress_DocumentWidget_(d);
+            updateHover_Window(window_Widget(w));
         }
         init_Anim(&d->sideOpacity, 0);
         init_Anim(&d->altTextOpacity, 0);
diff --git a/src/ui/window.c b/src/ui/window.c
index 83dae427..352b0797 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -952,6 +952,10 @@ static void applyCursor_Window_(iWindow *d) {
     }
 }
 
+void updateHover_Window(iWindow *d) {
+    d->hover = hitChild_Window(d, mouseCoord_Window(d, 0));
+}
+
 iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
     iMainWindow *mw = (type_Window(d) == main_WindowType ? as_MainWindow(d) : NULL);
     switch (ev->type) {
@@ -1149,6 +1153,9 @@ iBool dispatchEvent_Window(iWindow *d, const SDL_Event *ev) {
 }
 
 iAnyObject *hitChild_Window(const iWindow *d, iInt2 coord) {
+    if (coord.x < 0 || coord.y < 0) {
+        return NULL;
+    }
     iForIndices(i, d->roots) {
         if (d->roots[i]) {
             iAnyObject *hit = hitChild_Widget(d->roots[i]->widget, coord);
diff --git a/src/ui/window.h b/src/ui/window.h
index 81fc2c06..6c921f09 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -146,6 +146,7 @@ void        setUiScale_Window       (iWindow *, float uiScale);
 void        setCursor_Window        (iWindow *, int cursor);
 iBool       setKeyRoot_Window       (iWindow *, iRoot *root);
 iBool       postContextClick_Window (iWindow *, const SDL_MouseButtonEvent *);
+void        updateHover_Window      (iWindow *);
 
 iWindow *   get_Window              (void);
 iBool       isOpenGLRenderer_Window (void);