Improved keyboard focus handling after editing and reloading  song