VE-1541: Pass surface when opening window