Issue #2351869 by ChrisZZ: Fixed Error when user is leaving some matching items open.