Liveview default modal re-renders on cancel and clicking the 'back' button

I opened an issue in github on that, but I wonder what is the possible workaround.

out-of-the-box generated modal re-renders when closing modal and clicking ‘back’ on browser. The modal was generated by the default generator phx.gen.live Everything works fine, but the modal re-rendering get’s stuck in a loop when using the browser’s back button. See gif
modal_repeat2

I changed the default JS.navigate to JS.patch but nothing changed either.

P.S I’m very new to Phoenix. Here is my actual repo. it’s not one page, but it comes with a SQLite DB saved in github too, so should work as is. When in the app, click on the Analysis in the main menu and then select one of Countries, States, Cities, Territories List . They all have the same issue and were all generated with the default phx.gen.live Thanks
combobox repo