I modified this behavior, after a remark in this thread:
@tourette95 Can you please check that the proposed modification works for you? Thanks