Fixes the issue on most desktop browsers and mobile firefox on Android but not on mobile chrome

Jira issue: APPPARTY-52