One more fix for Cancel button. #1461