diff --git a/gtk-gui.c b/gtk-gui.c
index 71762f535..a34ac4fb2 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -163,6 +163,9 @@ static void ask_save_changes()
 
 void on_destroy(GtkWidget* w, gpointer data)
 {
+	/* Make sure to flush any modified dive data */
+	update_dive(NULL);
+
 	if (unsaved_changes())
 		ask_save_changes();
 	gtk_main_quit();