diff --git a/components/board/group-session-dialog.tsx b/components/board/group-session-dialog.tsx
index 38bb7ae..43d6133 100644
--- a/components/board/group-session-dialog.tsx
+++ b/components/board/group-session-dialog.tsx
@@ -364,7 +364,12 @@ export function GroupSessionDialog({
               </Button>
             </div>
             <Button
-              onClick={handleSaveAll}
+              onClick={() => {
+                // Save first (flushing the note + every dirty row), then
+                // close -- handleOpenChange's own background flush is a
+                // no-op at that point.
+                void handleSaveAll().then(() => handleOpenChange(false));
+              }}
               disabled={savingAll}
               className="hover:brightness-110"
               style={{
@@ -376,7 +381,7 @@ export function GroupSessionDialog({
                 color: isDark ? "#18181b" : "#ffffff",
               }}
             >
-              {savingAll ? "Saving…" : "Save"}
+              {savingAll ? "Saving…" : "Save and Close"}
             </Button>
           </div>
         </DialogContent>