[TASK] Improve workspaces enabled check and overlaying