Instead of focusing back to the picker icon, one can imagine to focus back on the last known focused element?
This would require to save the focused element before line 177.