If it were me...I would loosen the lock nut on the shifter handle, then screw the handle all the way down, then re-lock it. This will disengage the shifter lock from it's detents so all you have is the transmission's detents. Then put it into whatever position and give it hell. If it pops-out, it will be because there is now something wrong in the transmission.. like a bent fork or rounded dogs.. because of it slipping out of gear before under power. Unfortunately the only cure for that is parts replacement...all this because someone at the plant couldn't line up the two with the adjustments. Now mine was a little different..the two didn't/wouldn't line up. I had to "adjust" my shifter detents to match the transmissions with a dremel....and put a stop for the "Park" position.