JBIDE-16592: Fix selection issues