I still have this problem when filling up but I place the nozzle a cm or two in the hole and use the lowest notch of the handle (farthest from the nozzle) part to prop it to fill gas.

Its worse during winters for me for some reason and I think it wont be an easy repair for the dealer.