Followup 6ec34a3deed: prevent focus loss on tool clicks

Change-Id: I7b756013ac234ad80937466a5881a1f92d8723d1