An aerosol-generating device is provided, including: a battery, and a heater configured to heat the battery, in which one or both of the battery and the heater are movably mounted in the aerosol-generating device, such that the battery and the heater are relatively movable towards each other between a near position and a distanced position, the near position being different from the distanced position. An aerosol-generating system including an aerosol-generating article and the aerosol-generating device, and a method for heating a battery in the aerosol-generating device, are also provided.