SOAP-653: Fixed saving when closing and removing projects