GCP-7059 Fix unsaved changes prompt for:
- Tools -> Add Entry
- Unwanted prompt even after save