CON-1016 | Fix for touchscreen devices v2