LPS-40875

Hey Shinn,

I don't know enough about front end stuff to say whether or not this is the right way to fix the issue. Let me know if it needs to be reworked.