Fix for Issue #1877 and keep user experience when renaming a notebook