Forgot about the layouts!
I changed it to extended scrolling and reduced the focus group to the size of a single cell (as you suggested) and it seems to have done the trick.
Thanks