Branch selection is not remembered

Created by: teo-sk

This issue actually is #276 (closed) but that one was marked as closed, although it's still there. Maybe in 2.2 it was really solved, but some newer commits brought the issue back?