In The Pursuit of Unhappiness, Daniel Haybron has defended an emotional state theory of happiness, according to which happiness consists in a broadly positive balance of emotions, moods, and mood propensities. In this paper, I argue that Haybron’s theory should be modified in two ways. First, contra Haybron, I argue that sensory pleasures should be regarded as constituents of happiness, alongside emotions and moods. I do this by showing that sensory pleasures are sufficiently similar to emotions for them to be (...) included within the class of happiness-constituting states. Second, I argue that a plausible theory of happiness should not include mood propensities, since their inclusion is either counterintuitive or unnecessary. (shrink)