Finish file tree renaming on blur

Fix for #9364 and #9370.

cc @ingorichter @RaymondLim