Is there a good way of keeping track of tabs in different windows across reboots? I recently tried having all tabs related to a specific project in their own window on a different workspace, and everytime Firefox wanted to restart because of an update I had to close both windows and then go to History - recently closed windows to get back my tabs.

I'd love something like tab groups that included windows, so I can seamlessly move tabs between windows, recover them after restarts, etc.