DEV-53008 - Fix Keyboard Activation on click