Making keyboard interactions to retain selection. Fixes issue 2779