Prevent 'jumping out' and 'back in' when using notifications for the current topic

Yeah I am going to look through the routing code.