#CFTMT-5 fixed focus issue related to swipe