Code Search (^F) behavior changed in 2017 and that's confusing

The behavior of the Search in code has changed since v. 2017.

Not easy to explain, but I'll try anyway.

We have two words, "Hello" at line 200, and "World" at line 300.

- Cursor is at line 100 and I search "World", which first occurrence from that line is line 300.
- Cursor is now at line 300 (and do some work here)
- Now I go back to line 100, and want to search "Hello" (^F)
➟ Problem:
- Since the previous search (selected in search bar) was "World", PS jumps to line 300 first to highlight that word
- then I enter "Hello" (that overwrites the selected "World") which cannot be found at line 200 since PS is already at line 300...

That's confusing.

Better behavior would be: 

Either
- previous search is displayed and selected but not searched (cursor doesn't move) until Enter is pressed, or the word is modified
Or
- if user overwrites the previous search word (while selected in search bar) the search starts from where the cursor was initially (line 100)

(I prefer the first one)