Merging bugfix
Bugfix when arriving directly on modal