fix #38101 and #36651
Merge pull request #1433 from AntonioBL/workspaces_palettebox

fix #38101 and #36651