diff --git a/src/Edit.c b/src/Edit.c
index 84259d094..0dd609785 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -7587,7 +7587,7 @@ void EditMarkAll(LPCWSTR wchFind, int sFlags, DocPos rangeStart, DocPos rangeEnd
     char chText[2048] = { L'\0'};
     WCHAR wchText[2048] = { L'\0'};
 
-    IgnoreNotifyDocChangedEvent(EVM_Default);
+    IgnoreNotifyDocChangedEvent(EVM_Default); // goto observe:
 
     if (StrIsEmpty(wchFind)) {
 
@@ -7686,10 +7686,6 @@ void EditMarkAll(LPCWSTR wchFind, int sFlags, DocPos rangeStart, DocPos rangeEnd
             end = rangeEnd;
             iPos = _FindInTarget(wchText, sFlags, &start, &end, true, FRMOD_NORM);
         };
-
-        if (count > 0) {
-            SciCall_SetSelectionNCaret(SciCall_GetMainSelection(), SciCall_GetSelectionNEnd(SciCall_GetMainSelection()));
-        }
         Globals.iMarkOccurrencesCount = count;
     }
 
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 0c96ce3a9..2c172ac15 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -5566,11 +5566,11 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
             switch (iLoWParam) {
 
             case IDM_EDIT_FINDNEXT:
-                EditFindNext(Globals.hwndEdit, &s_FindReplaceData, false, false, false);
+                EditFindNext(Globals.hwndEdit, &s_FindReplaceData, false, false, true);
                 break;
 
             case IDM_EDIT_FINDPREV:
-                EditFindPrev(Globals.hwndEdit, &s_FindReplaceData, false, false, false);
+                EditFindPrev(Globals.hwndEdit, &s_FindReplaceData, false, false, true);
                 break;
 
             case IDM_EDIT_REPLACENEXT: