This worked for me.
- Right click blank area of Desktop
- Select Display Settings
- click MultiTasking
- Set Virtual Desktops "On the taskbar, show windows that are open on" **** to Only the desktop I'm using
@patdw: this definitely helped getting rid of the bug, although I don't know what other implications it might have.