diff --git a/src/Edit.c b/src/Edit.c
index 0a3ac4da8..76161ed4f 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -7687,6 +7687,9 @@ void EditMarkAll(LPCWSTR wchFind, int sFlags, DocPos rangeStart, DocPos rangeEnd
             iPos = _FindInTarget(wchText, sFlags, &start, &end, true, FRMOD_NORM);
         };
 
+        if (count > 0) {
+            SciCall_SetSelectionNCaret(SciCall_GetMainSelection(), SciCall_GetSelectionNEnd(SciCall_GetMainSelection()));
+        }
         Globals.iMarkOccurrencesCount = count;
     }
     EndWaitCursor();