There is provided an aerosol-generating device including a heating element and an external housing. The external housing is elongate and is configured to resist rolling. An aerosol generating system is also provided, including the aerosol-generating device and a charging device having a cavity configured to receive the aerosol-generating device.