Make Firefox prompt me to close even when using session saving?

Make Firefox prompt me to close even when using session saving?

It appears that Firefox 3.5 has a "feature" where if you have it set to restore your tabs on restart, it doesn't prompt you for confirmation when you close it (see this page for more background). However, I'd like it to both save my state and prompt me when I (generally accidentally) close it.