This fixes #7894.  The timeout is now cleared and the form opens immediately.
This fixes #7893.  It just update willy-nilly, so it might have to be fixed in the future.