Fix trigger selection after creation

With @tiennou's recent changes the wrong trigger was being selected (not the new trigger) after creation
Also - fix a potential exception, and scroll to the trigger once added

Possibly fixes #1636