diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index 2d19c74e7..6ed686c48 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -7815,7 +7815,13 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
 		{
 			return (LRESULT)_mainMenuHandle;
 		}
-		
+	
+		case NPPM_INTERNAL_CLEARINDICATOR :
+		{
+			_pEditView->clearIndicator(SCE_UNIVERSAL_FOUND_STYLE_2);
+			return TRUE;
+		}
+
 		case WM_INITMENUPOPUP:
 		{
 			_windowsMenu.initPopupMenu((HMENU)wParam, _pEditView);
diff --git a/PowerEditor/src/Notepad_plus.h b/PowerEditor/src/Notepad_plus.h
index cc5bce972..896fa3f50 100644
--- a/PowerEditor/src/Notepad_plus.h
+++ b/PowerEditor/src/Notepad_plus.h
@@ -727,6 +727,7 @@ private:
 			case '%':
 			case '$':
 			case '"':
+			case '\'':
 			case '~':
 			case '&':
 			case '{':
diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
index 024291786..8f1c1ce51 100644
--- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
+++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
@@ -664,6 +664,11 @@ BOOL CALLBACK SettingsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPara
 				case IDC_CHECK_ENABLSMARTHILITE :
 				{
 					nppGUI._enableSmartHilite = !nppGUI._enableSmartHilite;
+					if (!nppGUI._enableSmartHilite)
+					{
+						HWND grandParent = ::GetParent(_hParent);
+						::SendMessage(grandParent, NPPM_INTERNAL_CLEARINDICATOR, 0, 0);
+					}
 					return TRUE;
 				}	
 
@@ -947,8 +952,7 @@ BOOL CALLBACK LangMenuDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPara
 						}
 					}
 
-					HWND grandParent;
-					grandParent = ::GetParent(_hParent);
+					HWND grandParent = ::GetParent(_hParent);
 
 					if (LOWORD(wParam)==IDC_BUTTON_REMOVE)
 					{
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index 5b025ceb0..180d7d21e 100644
--- a/PowerEditor/src/resource.h
+++ b/PowerEditor/src/resource.h
@@ -284,7 +284,7 @@
 	#define NPPM_INTERNAL_ISTABBARREDUCED			(NOTEPADPLUS_USER_INTERNAL + 12)
 	#define NPPM_INTERNAL_ISFOCUSEDTAB				(NOTEPADPLUS_USER_INTERNAL + 13)
 	#define NPPM_INTERNAL_GETMENU					(NOTEPADPLUS_USER_INTERNAL + 14)
-	//#define NPPM_INTERNAL_MARKALL					(NOTEPADPLUS_USER_INTERNAL + 15)
+	#define NPPM_INTERNAL_CLEARINDICATOR			(NOTEPADPLUS_USER_INTERNAL + 15)
 
 // See Notepad_plus_msgs.h
 //#define NOTEPADPLUS_USER   (WM_USER + 1000)