I had swapped to three button mode just after making this post, but swapping back appears to have fixed it. Thanks for the tip!