diff --git a/src/apps/terminal/TermViewStates.cpp b/src/apps/terminal/TermViewStates.cpp
index 93b19c2eeb..daaa697ca5 100644
--- a/src/apps/terminal/TermViewStates.cpp
+++ b/src/apps/terminal/TermViewStates.cpp
@@ -966,10 +966,10 @@ TermView::HyperLinkState::_EntryExists(const BString& path,
 void
 TermView::HyperLinkState::_UpdateHighlight()
 {
-	BPoint where;
-	uint32 buttons;
-	fView->GetMouse(&where, &buttons, false);
-	_UpdateHighlight(where, fView->fModifiers);
+	if (fView == NULL)
+		return;
+
+	_UpdateHighlight(fView->fLastClickPoint, fView->fModifiers);
 }