diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index f4c2427475..5c958015d3 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -450,13 +450,13 @@ bool findChange(BufferView * bv, bool next)
 	Change orig_change = tip.paragraph().lookupChange(tip.pos());
 
 	if (next) {
-		for (; !tip.at_end(); tip.forwardPos()) {
+		for (; tip.pit() < tip.lastpit() || tip.pos() < tip.lastpos(); tip.forwardPos()) {
 			Change change = tip.paragraph().lookupChange(tip.pos());
 			if (!change.isSimilarTo(orig_change))
 				break;
 		}
 	} else {
-		for (; !tip.at_begin();) {
+		for (; tip.pit() > 0 || tip.pos() > 0;) {
 			tip.backwardPos();
 			Change change = tip.paragraph().lookupChange(tip.pos());
 			if (!change.isSimilarTo(orig_change)) {
diff --git a/status.20x b/status.20x
index df765159e9..f7b6c3cf60 100644
--- a/status.20x
+++ b/status.20x
@@ -96,6 +96,8 @@ What's new
 - Fix problem with numbering of some child documents when instant preview
   is active (bug 8673).
 
+- Made change-next work properly in tables (bug 6055).
+
 
 * DOCUMENTATION AND LOCALIZATION