Fork : Deda's patch (Focus item when switching view / layout)