CTRL+click won't display changed modal && cherry picked tab error display

(cherry picked from commit b971129)