diff --git a/mozilla/layout/generic/nsSelection.cpp b/mozilla/layout/generic/nsSelection.cpp
index 7b15da1a2c6..fa656903817 100644
--- a/mozilla/layout/generic/nsSelection.cpp
+++ b/mozilla/layout/generic/nsSelection.cpp
@@ -4415,6 +4415,8 @@ void nsTypedSelection::setAnchorFocusRange(PRInt32 indx)
   }
   else{
     mAnchorFocusRange = mRangeArray[indx];
+    // Make sure the caret appears on the next line, if at a newline
+    SetInterlinePosition(PR_TRUE);
   }
 }