This fixes the 'the fspanel is missing if I have always-on-top selected' bug and should also fix #1227 for OS X.

This patch needs testing on a multiscreen setup before being backported.