Fixing text caret (take 2)

The earlier change fixed the text caret for fullscreen, but broke it for
non-fullscreen.  This new change should fix it in both cases.