Fix #458 and consolidate where we're opening a new window and connecting to containers