An apparatus is configured to determine an adopted intra prediction mode on the basis of a most probable modes list, a selected modes list and a non-selected modes list having a first portion and a second portion, wherein the adopted intra prediction mode is one of a plurality of intra prediction modes comprising a plurality of angular intra prediction modes for predicting sample values of a current picture block. The apparatus includes a processor configured to generate the first portion of the non-selected modes list by including one or more angular intra prediction modes determined to be close to a respective angular intra prediction mode of the most probable modes list and the selected modes list. The processor is further configured to determine the adopted intra prediction mode.