Disclosed are power machines, and drive systems for use thereon, as well as methods of providing automatic gear shifting. The drive system includes a controller configured to implement automatic gear shifting. Gear engagement is determined following a gear shift, and a drive pump or other drive system components is automatically controlled to rotate a gearbox gear in first and second directions until the gear is properly engaged.