Right foot, right knee. Another option is to FMQ the design - as long as you drop the needle, you can turn the fabric without lifting the presser foot.
BTW - my knee lift had the same issue with working its way out of my Bernina. Took it back to the shop and whatever they did worked - no more issues.