Embodiments are described herein that involve a media playback system playing back a playback queue according to a continuous-playback mode. In one aspect, a playback device is provided that includes a network interface, one or more media processing components, a non-transitory computer-readable medium with program instructions stored thereon. The program instructions are executable by at least one processor to cause the media playback device to: add one or more items to a playback queue of the media playback device, where the one or more items include a continuous-playback item including at least one media item, and based on one or more characteristics of the continuous-playback item, play back the playback queue according to a continuous-playback mode, where playing back the playback queue according to the continuous-playback mode involves: detecting a continuous-playback trigger, and based on the detected continuous-playback trigger, adding at least one additional media item to the continuous-playback item.