A method for intra-coding a current block using an intra-prediction mode includes determining a left intra-mode of a left neighbor block and determining an above intra-mode of an above neighbor block. The method also includes, on condition that the left intra-mode and the above intra-mode are a same mode, using that same mode to determine a probability distribution for coding the intra-prediction mode and, on condition that at least one of the left intra-mode or the above intra-mode is a smooth intra-prediction mode, using the other of the left intra-mode and the above intra-mode to determine the probability distribution for coding the intra-prediction mode. The method also includes coding the intra-prediction mode using the probability distribution.