LPS-46151 Fix missing buttons issue