Noam Postavsky <npostavs@gmail.com> writes:

> Perhaps it would be better to use funcall-interactively?

Good idea.  How about the attached patch?

Thanks,
Stefan Kangas