Fix a few issues with new desktop dialog style