diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index cea5b723c6..02d8fcdc98 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1154,11 +1154,15 @@ bool BufferView::dispatch(FuncRequest const & cmd)
 
 	case LFUN_CHANGE_NEXT:
 		findNextChange(this);
+		// FIXME: Move this LFUN to Buffer so that we don't have to do this:
+		processUpdateFlags(Update::Force | Update::FitCursor);
 		break;
 
 	case LFUN_CHANGES_MERGE:
-		if (findNextChange(this))
+		if (findNextChange(this)) {
+			processUpdateFlags(Update::Force | Update::FitCursor);
 			showDialog("changes");
+		}
 		break;
 
 	case LFUN_ALL_CHANGES_ACCEPT:
diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 0cfd2cf868..fbb515ba39 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -333,10 +333,6 @@ bool findNextChange(BufferView * bv)
 		if (change != orig_change)
 			break;
 	}
-	// avoid crash (assertion violation) if the imaginary end-of-par
-	// character of the last paragraph of the document is marked as changed
-	if (tip.at_end())
-		tip.backwardPos();
 
 	// Now put cursor to end of selection:
 	bv->cursor().setCursor(cur);