Hide "item" label in gadget selector
Fix exception in edge case