diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
index 0603e0969..d0bd6dce0 100644
--- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
+++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
@@ -1321,7 +1321,7 @@ int FindReplaceDlg::processAll(ProcessOperation op, const TCHAR *txt2find, const
 		endPosition = cr.cpMax;
 	}
 
-	if (ProcessMarkAllExt && colourStyleID != -1)
+	if ((op == ProcessMarkAllExt) && (colourStyleID != -1))
 	{
 		startPosition = 0;
 		endPosition = docLength;
diff --git a/PowerEditor/src/WinControls/TaskList/TaskListDlg.h b/PowerEditor/src/WinControls/TaskList/TaskListDlg.h
index 32041574a..8a87a51a5 100644
--- a/PowerEditor/src/WinControls/TaskList/TaskListDlg.h
+++ b/PowerEditor/src/WinControls/TaskList/TaskListDlg.h
@@ -212,7 +212,7 @@ private :
 		COLORREF textColor = darkGrey;
 		int imgStyle = ILD_SELECTED;
 
-		if (lpDrawItemStruct->itemState && ODS_SELECTED)
+		if (lpDrawItemStruct->itemState & ODS_SELECTED)
 		{
 			imgStyle = ILD_TRANSPARENT;
 			textColor = black;