Removed bug for condition check of pop message in edit mode