feature #5157 fixing focus problem on pdc edition