diff --git a/src/kits/interface/TextView.cpp b/src/kits/interface/TextView.cpp
index f7d2952988..8f39e5dc86 100644
--- a/src/kits/interface/TextView.cpp
+++ b/src/kits/interface/TextView.cpp
@@ -1331,7 +1331,9 @@ void
 BTextView::GoToLine(int32 index)
 {
 	_CancelInputMethod();
+	_HideCaret();
 	fSelStart = fSelEnd = fClickOffset = OffsetAt(index);
+	_ShowCaret();
 }
 
 
@@ -1507,6 +1509,7 @@ BTextView::Select(int32 startOffset, int32 endOffset)
 				Highlight(fSelStart, fSelEnd);
 		}
 		fSelStart = fSelEnd = fClickOffset = startOffset;
+		_ShowCaret();
 	} else {
 		if (fActive) {
 			// draw only those ranges that are different