#144 Fixed notification focus issues