[DS-1489] Back button in Discovery broken in Firefox
Merge pull request #241 rebased