Fixed flickering issue for the edit protection