Address post-merge feedback from #3551

https://github.com/oaeproject/3akai-ux/pull/3551