Some functionalised dipeptides can form hydrogels when salts are added to solutions at high pH. We have used surface tension, conductivity, rheology, optical, confocal and scanning electron microscopy, (1)H NMR and UV-Vis spectroscopy measurements to characterise fully the phase behaviour of solutions of one specific gelator, 2NapFF, at 25 °C at pH 10.5. We show that this specific naphthalene-dipeptide undergoes structural transformations as the concentration is increased, initially forming spherical micelles, then worm-like micelles, followed by association of these worm-like micelles. On addition of a calcium salt, gels are generally formed as long as worm-like micelles are initially present in solution, although there are structural re-organisations that occur at lower concentrations, allowing gelation at lower than expected concentration. Using IR and SANS, we show the differences between the structures present in the solution and hydrogel phases.