Fix calendar popping up an extra frame

Bug report submitted so hopefully will be fixed in emacs at some point,
but this will do for now.