[Bugfix][Part 2] Add missing changes from sweet veil PR

[torranx]

What are the changes?

This is in addition to #3265

Why am I doing these changes?

What did change?

Screenshots/Videos

How to test the changes?

Checklist

• I'm using beta as my base branch
• There is no overlap with another PR?
• The PR is self-contained and cannot be split into smaller PRs?
• Have I provided a clear explanation of the changes?
• Have I considered writing automated tests for the issue?
• Have I tested the changes (manually)?
  • Are all unit tests still passing? (npm run test)
• Are the changes visual?
  • Have I provided screenshots/videos of the changes?