maybe not related, @abenari maybe this needs to be part of the ui-fixes branch?