Entity search popup search clearing: second edition #3534

Following on from #3528,
Looks like confirm button press is not acting the same as double-clicking.
Should align these so both reset state on selection. Ideally route both through a single function.