Fix block picker navigation (closes #29)