diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/SearchEngine.java b/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/SearchEngine.java
index 30f5e75d..3148f16d 100755
--- a/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/SearchEngine.java
+++ b/RSyntaxTextArea/src/main/java/org/fife/ui/rtextarea/SearchEngine.java
@@ -93,10 +93,6 @@ public static SearchResult find(JTextArea textArea, SearchContext context) {
 		int start = forward ? Math.max(c.getDot(), c.getMark()) :
 						Math.min(c.getDot(), c.getMark());
 
-		String findIn = getFindInText(textArea, start, forward);
-		if (!context.getSearchWrap() && (findIn == null || findIn.isEmpty())) {
-			return new SearchResult();
-		}
 
 		int markAllCount = 0;
 		if (doMarkAll) {
@@ -104,6 +100,11 @@ public static SearchResult find(JTextArea textArea, SearchContext context) {
 					getMarkedCount();
 		}
 
+		String findIn = getFindInText(textArea, start, forward);
+		if (!context.getSearchWrap() && (findIn == null || findIn.isEmpty())) {
+			return new SearchResult();
+		}
+
 		SearchResult result = SearchEngine.findImpl(findIn == null ? "" : findIn, context);
 		if (result.wasFound() && !result.getMatchRange().isZeroLength()) {
 			// Without this, if JTextArea isn't in focus, selection