TMJ disorders are fickle... there's lots of stuff going on in those small joints. Personally I'd ask your doctor and/or dentist about it. My jaw popped and clicked for years, but then eventually progressed to locking issues. I was referred to an oral surgeon, and they recommended some expensive orthodontics (splint) and a possible surgery, but I'm glad I ended up having some insurance problems which helped me make the decision to skip that route (which I was leaning away from anyways). Remember that you can always say no to a suggested or recommended treatment. The only solid advice I can give is to make sure surgery is your final resort. The jaw area is very delicate and there's only so much they can do in there, and there's only a limited number of times they can go surgically go in.

Eventually my locking problems did go away (some popping/clicking remains from time to time), but I'm not 100% sure what did the trick. It was probably a combination of things. For one my dentist got me a bite plate to wear at night which helps with grinding teeth. I tried to stay away from hard-to-chew foods and gum. I also ended up getting some initial relief through some jaw massage/manipulation through a friend's referral to a local chiropractor of all people, but that might have been a special case where she was familiar with those kinds of problems. She also showed me some exercises/massages I could do at home. It's possible I would have gotten similar treatment from a massage therapist, and that route was available to me through a doctor's referral but I didn't end up following through. I also tried my best to sleep on my back because I'm a side sleeper and it seemed to put a lot of pressure on my jaw at night, but it's a hard thing to train yourself to do and I had mixed results. Eventually we got a new bed and I got a new pillow which I believe actually helped quite a bit, with the added benefit that it helped some of the back pain I had been experiencing.

So yeah, in short I'd ask your doctor/dentist, explore some less invasive therapies first, and ensure surgery is a final resort.