Improved wallet selection after close and delete of wallet
No longer creates new wallet after last delete.