Make click and enter key work for data trees again
[4.2.x]
ERM28865
Change-Id: I71a1b0718097e46900070da0761dfbbefdb821ed