Have you changed the file association within the Default Programs list for Vista? They are located right on the start menu so you should see them right away. From there change the default and see what happens.
I know when i click a picture it open Photo Gallery as well. It also does that when i click on it and select preview. So i dont know exactly what your issue is. :S