LPS-33720

@yxingwu @asikar 

Eduardo, not sure if this solution is acceptable since it also changes the behavior in other parts of the portal. If it's not ok, Yuxing will work with you on another fix.