quick workaround for force-desktop-mode-bug...will have a look for a
better solution soon