diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 97ba9190351..d486daf8039 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -52,6 +52,7 @@
 #include "BLO_writefile.h"
 #include "BLO_undofile.h"
 
+#include "BKE_blendfile.h"
 #include "BKE_blender.h"
 #include "BKE_blender_undo.h"
 #include "BKE_context.h"
@@ -469,6 +470,10 @@ void WM_exit_ext(bContext *C, const bool do_python)
       WM_event_remove_handlers(C, &win->modalhandlers);
       ED_screen_exit(C, win, WM_window_get_active_screen(win));
     }
+
+    if (U.runtime.is_dirty) {
+      BKE_blendfile_userdef_write_all(NULL);
+    }
   }
 
   BLI_timer_free();