diff --git a/PowerEditor/src/Notepad_plus.h b/PowerEditor/src/Notepad_plus.h
index a61930188..2b887ae39 100644
--- a/PowerEditor/src/Notepad_plus.h
+++ b/PowerEditor/src/Notepad_plus.h
@@ -706,6 +706,11 @@ private:
 			case '\n':
 			case '\r':
 			case '.':
+			case ',':
+			case '?':
+			case ';':
+			case ':':
+			case '!':
 			case '(':
 			case ')':
 			case '[':
@@ -714,9 +719,8 @@ private:
 			case '-':
 			case '*':
 			case '/':
-			case '!':
 			case '#':
-			//case '@':
+			case '@':
 			case '^':
 			case '%':
 			case '$':
diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
index 10666bd4f..c49e864b1 100644
--- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
+++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
@@ -927,6 +927,7 @@ int FindReplaceDlg::processAll(ProcessOperation op, const char *txt2find, const
 	
 	if (!isCreated() && !txt2find)
 		return nbReplaced;
+
 	if ((op == ProcessReplaceAll) && (*_ppEditView)->getCurrentBuffer().isReadOnly())
 		return nbReplaced;