I feel like I've always had this issue, usually solved by shift + return.
It's kind of muscle memory for me by this point.
@malik the LB Jeans that b_F recommended are a good option, however I don't think he's accepting new orders at the moment.
The waist might end up being a little large, but most of the Freewheelers 601xx variants should work for you as well, they're pretty generous in the thighs / top block.