01 gt Fuel Problems!

New to celicas, I love my car ('01 toyota celica gt manual) just got it a couple months ago. Question is whenever I go to pump gas right after I put gas and i turn my car on it turns right off. After I drive a couple blocks its fine, and also when I'm at a stop it feels a little weird when accelerating. I'm thinking of replacing fuel filter and seeing if that fixes it. Any other ideas of what it might he? Thanks smile