Update notes immediately after closing/reopening

Closes #15091 (closed) Since this is a timing issue, it's hard to describe with pictures, so I created a short screen capture: https://vid.me/kcB1