Fix issue with tab key