diff --git a/fapolicy_analyzer/ui/config/config_admin_page.py b/fapolicy_analyzer/ui/config/config_admin_page.py
index e9ec3dcf4..32e2b02fd 100644
--- a/fapolicy_analyzer/ui/config/config_admin_page.py
+++ b/fapolicy_analyzer/ui/config/config_admin_page.py
@@ -92,8 +92,8 @@ def on_save_clicked(self, *args):
         changeset, valid = self.__build_and_validate_changeset(show_notifications=False)
         if valid:
             self.__saving = True
-            self._unsaved_changes = False
             dispatch(apply_changesets(changeset))
+            self._unsaved_changes = False
         else:
             self.__status_info.render_config_status(changeset.info())
 
@@ -165,7 +165,8 @@ def on_next_system(self, system: Any):
     def on_text_view_config_changed(self, config: str):
         self.__modified_config_text = config
         self.__config_validated = False
-        self._unsaved_changes = True if not self._first_pass else False
+        # print(self._unsaved_changes, self._first_pass)
+        self._unsaved_changes = True  # if not self._first_pass else False
         if self._first_pass:
             self._first_pass = False
         dispatch(modify_config_text(config))
diff --git a/fapolicy_analyzer/ui/rules/rules_admin_page.py b/fapolicy_analyzer/ui/rules/rules_admin_page.py
index b11924347..b6a61d85e 100644
--- a/fapolicy_analyzer/ui/rules/rules_admin_page.py
+++ b/fapolicy_analyzer/ui/rules/rules_admin_page.py
@@ -212,8 +212,8 @@ def on_save_clicked(self, *args):
         self.__update_list_view(changeset)
         if valid:
             self.__saving = True
-            self._unsaved_changes = False
             dispatch(apply_changesets(changeset))
+            self._unsaved_changes = False
         else:
             overrideDialog = self.get_object("saveOverrideDialog")
             self.get_object("overrideText").set_text(RULES_OVERRIDE_MESSAGE)