UI-2974  Incorrect UI of some gadget when editing