I keep mixing these up. In Swedish, one is humor and the other humör. Moreover, the English word humour is similar to both. Can anyone think of a memory rule or something?
In the French language you have the same difficulty (humeur - humour).
I remembered the word humuro by the sentence: Ridi kiam oni kuras kontraŭ la muro estas malbona hu-muro.
The other way is to look on the English word m-oo-d (which means hum-o-ro).