Connection windows 8

This should hopefully fixed issues reported by @gusferguson (Windows 8) and @sbesson (mac from Edi)
@pwalczysko noticed a similar problem on Vista.

To test:
 * Use the Connection scenario
 * Repeat steps 5 and 6