I’d like magit-status to open full frame, ie a single window. When I hit q to exit, I’d like my previous window configuration to be restored.

What’s the best way to do this? Setting the follow var causes it to open full frame, but removes all windows except for one upon exit:

 (setq magit-display-buffer-function
  #'magit-display-buffer-fullframe-status-v1)

I can get to my previous window layout with winner-undo, but I’d like q to do the right thing in this case.

Any thoughts?