Cannot put the shield away

[Wood]

I'm not sure if this a bug or not, but how do you put your shield away?
I was jousting with a staff and a wooden shield when my horse died and I couldn't fight properly with the staff because the shield would not go away. I was forced to poke people with the end of it instead of smashing it round the enemy's head. Is this intentional or is it a bug?

 

[Wanderer]

If you were jousting, you had a lance...

... and a lance only pokes.

 

[Ingolifs]

Mmm. The starting polearm for the monk is like that. It is one handed, but it functions much better if you don't have a shield with it, because you can do more than just poke with it.