--- a/ChangesBrowser.st	Fri Feb 10 19:55:48 2017 +0100
+++ b/ChangesBrowser.st	Fri Feb 10 20:42:28 2017 +0100
@@ -2683,7 +2683,7 @@
 
     self
         askForSearch:'Class to search for:'
-        initialAnswer:current
+        initialAnswer:(lastSearchString ? current)
         thenSearchUsing:[:searchString :changeNr |
                             |thisClassName|
 
@@ -2697,6 +2697,8 @@
 
     lastSearchType := #class.
     changeNrShown == 0 ifTrue:[changeNrShown := nil].
+
+    "Modified: / 10-02-2017 / 20:41:22 / cg"
 !
 
 findFirstForClass
@@ -5873,6 +5875,8 @@
     searchString isNil ifTrue:[
         ^ cancelBlock value
     ].
+    lastSearchString := searchString.
+    
     directionHolder value == #first ifTrue:[
         self findFirstForClass:searchString.
         ^ self.
@@ -5895,6 +5899,8 @@
         ].
         self findNextForWhich:searchBlock
     ].
+
+    "Modified: / 10-02-2017 / 20:40:59 / cg"
 !
 
 askForSearchString:msg initialAnswer:initial directionInto:aValueHolder