Issue 973441 2

This should be done in the code related to UI (panel.js).