Comment 3 for bug 872836

The same problem is also when returning from simulator to editor; again it returns at a different template (and not the first one).