New patches should go into the master branch first and only backported to the stable branch (Plasma/6.0) after the original MR was merged. Please change your MR's target branch accordingly.
You provided an explanation here in the MR about why this patch is necessary and how it improves on the current state. The commit message should have such an explanation too. Please add one there.
All in all, it's not ideal that we need this, but it does seem like an improvement for the user so I'm in favor overall. I only have a couple of nit-picks, no objections to the actual logic.