--- a/Tools__ChangeSetBrowser2.st	Fri May 26 10:56:45 2017 +0100
+++ b/Tools__ChangeSetBrowser2.st	Fri Jun 16 13:07:11 2017 +0100
@@ -3250,9 +3250,10 @@
     self changesDo:[:chg|chg removed ifFalse:[changesToApply add: chg]].
     self changeMenuApplyChanges: changesToApply.
     "Advance to next change"
-    changeIdx := changeList list identityIndexOf: changesToApply last change.
-    changeIdx < changeList list size ifTrue:[
-        changeList selection: { changeList list at: changeIdx + 1 }
+    changeIdx := changeList list findFirst: [:each | each change == changesToApply last ].
+    changeIdx <= changeList list size ifTrue:[
+        changeIdx := changeIdx min: changeList list size.
+        changeList selection: { changeList list at: (changeIdx + 1 min: changeList list size)}
     ] ifFalse:[ 
         changeList redrawListItemAt: changeIdx.
     ].
@@ -3265,6 +3266,7 @@
     "Created: / 04-08-2011 / 17:26:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 28-12-2011 / 15:49:00 / cg"
     "Modified: / 25-04-2015 / 22:17:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 05-05-2017 / 17:04:16 / jv"
 !
 
 changeMenuApplySelection: changeList