Refs #360. Added a selenium test showing that this ticket fixed issue #369 as well.