Continuing a swap

Hello!

Can you make it more intuitive to stay in a swap?
To start a swap is easy, but to continue or updating or replying, myself and others often end up with a new swap and then we have to cancel and redo it.
Before it worked seamlessly, but with the new update it is so easy to make mistakes.
Thanks for your consideration,
Ben