Also fix setting first active entry when searching

Previous bug fixed as last commit.