Closes #420 by using the angular event bus if a modal is present.
Merge commit '3857b99c8b1c9ff3ea31213ccd93e4862d79acbf' into HEAD