Settings > Applications > Manage Applications > All(tab) > Samsung Home (or as it is on My Galaxy S2, TWLauncher).
Hit the 'Clear Data' button.
That will force close the app.
I did a reboot after this so everything would stick and for my own sanity check.
That worked a treat for me.