Flush after add/edit Closes #3387