Fix some issues with wrong drawer item as picked