An aerosol-generating device (100) comprises a heating element (406) and an external housing (500, 502). The external housing is elongate and is adapted to resist rolling. An aerosol generating system comprises the aerosol-generating device and a charging device (600) having a cavity (302) configured to receive the aerosol-generating device.