diff --git a/apps/roam/src/components/Export.tsx b/apps/roam/src/components/Export.tsx
index 0f1c350fb..6d96250ac 100644
--- a/apps/roam/src/components/Export.tsx
+++ b/apps/roam/src/components/Export.tsx
@@ -15,8 +15,9 @@ import {
   RadioGroup,
   Radio,
   FormGroup,
+  Collapse,
 } from "@blueprintjs/core";
-import React, { useState, useEffect, useMemo, FormEvent } from "react";
+import React, { useState, useEffect, useMemo, useRef, FormEvent } from "react";
 import MenuItemSelect from "roamjs-components/components/MenuItemSelect";
 import { saveAs } from "file-saver";
 import { Result } from "roamjs-components/types/query-builder";
@@ -91,7 +92,13 @@ import {
   type NodeUidWithType,
 } from "~/utils/publishNodesToGroups";
 import { getLoggedInClient, getSupabaseContext } from "~/utils/supabaseContext";
-import { isNodeSharingEnabled } from "~/components/settings/utils/accessors";
+import {
+  bulkReadSettings,
+  isNodeSharingEnabled,
+} from "~/components/settings/utils/accessors";
+import refreshConfigTree from "~/utils/refreshConfigTree";
+import { flushPendingSettingWrites } from "~/utils/pendingSettingWrites";
+import ExportOptions from "./ExportOptions";
 
 const ExportProgress = ({ id }: { id: string }) => {
   const [progress, setProgress] = useState(0);
@@ -225,6 +232,21 @@ const ExportDialog: ExportDialogComponent = ({
     if (initialPanel) setSelectedTabId(INITIAL_PANEL_TO_TAB_ID[initialPanel]);
   }, [initialPanel, sharingEnabled]);
   const [includeDiscourseContext, setIncludeDiscourseContext] = useState(false);
+  const [exportOptionsOpen, setExportOptionsOpen] = useState(false);
+  const exportOptionsOpened = useRef(false);
+  // Collapse unmounts the panels while closed, so each open seeds them from current values.
+  const exportGlobalSettings = useMemo(
+    () => bulkReadSettings().globalSettings,
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [exportOptionsOpen],
+  );
+
+  // Option panels also write legacy config blocks, so refresh the tree as SettingsDialog
+  // does, but only if they were opened: refreshConfigTree re-reads every node page.
+  const closeDialog = (): void => {
+    if (exportOptionsOpened.current) refreshConfigTree();
+    onClose();
+  };
   const [gitHubAccessToken, setGitHubAccessToken] = useState<string | null>(
     getSetting<string | null>("oauth-github", null),
   );
@@ -756,7 +778,7 @@ const ExportDialog: ExportDialogComponent = ({
       });
     } finally {
       setLoading(false);
-      onClose();
+      closeDialog();
     }
   };
 
@@ -796,7 +818,7 @@ const ExportDialog: ExportDialogComponent = ({
           fileCount: files.length,
         });
       }
-      onClose();
+      closeDialog();
     } catch (e) {
       setError("Failed to export files.");
       posthog.capture("Export Dialog: Export Failed", {
@@ -888,7 +910,7 @@ const ExportDialog: ExportDialogComponent = ({
             : "success",
         id: "query-builder-publish-success",
       });
-      if (hasPublishedNodes) onClose();
+      if (hasPublishedNodes) closeDialog();
     } catch (e) {
       internalError({
         error: e as Error,
@@ -951,41 +973,60 @@ const ExportDialog: ExportDialogComponent = ({
           />
         </Label>
 
-        <div className="flex items-end justify-between">
+        <div className="mt-2 flex justify-end">
+          <FormGroup className={`m-0`} inline>
+            <Checkbox
+              alignIndicator={"right"}
+              checked={includeDiscourseContext}
+              onChange={(e) => {
+                setIncludeDiscourseContext(
+                  (e.target as HTMLInputElement).checked,
+                );
+              }}
+              labelElement={
+                <Tooltip
+                  className="m-0"
+                  content={
+                    "Include the discourse context of each result in the export."
+                  }
+                >
+                  <span>Discourse context</span>
+                </Tooltip>
+              }
+            />
+          </FormGroup>
+        </div>
+        <div className="mt-1 flex items-center justify-between gap-4">
+          <Button
+            minimal={true}
+            small={true}
+            icon={exportOptionsOpen ? "chevron-down" : "chevron-right"}
+            text="Export options"
+            onClick={() => {
+              const nextOpen = !exportOptionsOpen;
+              setExportOptionsOpen(nextOpen);
+              if (nextOpen) exportOptionsOpened.current = true;
+              posthog.capture("Export Dialog: Options Toggled", {
+                open: nextOpen,
+              });
+            }}
+          />
           <span>
             {typeof results === "function"
               ? "Calculating number of results..."
               : `Exporting ${results.length} results`}
           </span>
-          <div className="flex flex-col items-end">
-            <FormGroup className={`m-0`} inline>
-              <Checkbox
-                alignIndicator={"right"}
-                checked={includeDiscourseContext}
-                onChange={(e) => {
-                  setIncludeDiscourseContext(
-                    (e.target as HTMLInputElement).checked,
-                  );
-                }}
-                labelElement={
-                  <Tooltip
-                    className="m-0"
-                    content={
-                      "Include the discourse context of each result in the export."
-                    }
-                  >
-                    <span>Discourse context</span>
-                  </Tooltip>
-                }
-              />
-            </FormGroup>
-          </div>
         </div>
+        <Collapse isOpen={exportOptionsOpen}>
+          <div className="max-h-64 overflow-y-auto">
+            <ExportOptions globalSettings={exportGlobalSettings} />
+          </div>
+        </Collapse>
       </div>
       <div className={Classes.DIALOG_FOOTER}>
         <div className={Classes.DIALOG_FOOTER_ACTIONS}>
           <span className="text-red-700">{error}</span>
-          <Button text={"Cancel"} intent={Intent.NONE} onClick={onClose} />
+          <Button text={"Cancel"} intent={Intent.NONE} onClick={closeDialog} />
           <Button
             text={"Export"}
             intent={Intent.PRIMARY}
@@ -1009,6 +1050,9 @@ const ExportDialog: ExportDialogComponent = ({
               // eslint-disable-next-line @typescript-eslint/no-misused-promises
               setTimeout(async () => {
                 try {
+                  // Awaited, not just fired: a commit only starts the Roam update, and an option edited
+                  // a moment ago would otherwise still read as its previous value here.
+                  await flushPendingSettingWrites();
                   const exportType = exportTypes.find(
                     (e) => e.name === activeExportType,
                   );
@@ -1052,7 +1096,7 @@ const ExportDialog: ExportDialogComponent = ({
                             destination: activeExportDestination,
                             fileCount: files.length,
                           });
-                          onClose();
+                          closeDialog();
                         }
                       } catch (error) {
                         const e = error as Error;
@@ -1072,7 +1116,7 @@ const ExportDialog: ExportDialogComponent = ({
                         destination: activeExportDestination,
                         fileCount: files.length,
                       });
-                      onClose();
+                      closeDialog();
                       return;
                     }
 
@@ -1089,7 +1133,7 @@ const ExportDialog: ExportDialogComponent = ({
                         destination: activeExportDestination,
                         fileCount: files.length,
                       });
-                      onClose();
+                      closeDialog();
                     });
                   } else {
                     setError(`Unsupported export type: ${exportType}`);
@@ -1164,7 +1208,7 @@ const ExportDialog: ExportDialogComponent = ({
       </div>
       <div className={Classes.DIALOG_FOOTER}>
         <div className={Classes.DIALOG_FOOTER_ACTIONS}>
-          <Button text={"Cancel"} intent={Intent.NONE} onClick={onClose} />
+          <Button text={"Cancel"} intent={Intent.NONE} onClick={closeDialog} />
           <Button
             text={`Send ${
               isSendToGraph ? livePages.length : results.length
@@ -1224,7 +1268,7 @@ const ExportDialog: ExportDialogComponent = ({
       <div className={Classes.DIALOG_FOOTER}>
         <div className={Classes.DIALOG_FOOTER_ACTIONS}>
           <span className="text-red-700">{publishError}</span>
-          <Button text={"Cancel"} intent={Intent.NONE} onClick={onClose} />
+          <Button text={"Cancel"} intent={Intent.NONE} onClick={closeDialog} />
           <Button
             text={"Publish"}
             intent={Intent.PRIMARY}
diff --git a/apps/roam/src/components/settings/ExportSettings.tsx b/apps/roam/src/components/ExportOptions.tsx
similarity index 94%
rename from apps/roam/src/components/settings/ExportSettings.tsx
rename to apps/roam/src/components/ExportOptions.tsx
index b304bf8cf..04226933f 100644
--- a/apps/roam/src/components/settings/ExportSettings.tsx
+++ b/apps/roam/src/components/ExportOptions.tsx
@@ -5,15 +5,15 @@ import {
   GlobalNumberPanel,
   GlobalMultiTextPanel,
   GlobalSelectPanel,
-} from "./components/BlockPropSettingPanels";
+} from "~/components/settings/components/BlockPropSettingPanels";
 import {
   GLOBAL_KEYS,
   EXPORT_KEYS,
 } from "~/components/settings/utils/settingKeys";
-import { type SettingsSnapshot } from "./utils/accessors";
-import { ROAM_DOCS, withDocsLink } from "./utils/docs";
+import { type SettingsSnapshot } from "~/components/settings/utils/accessors";
+import { ROAM_DOCS, withDocsLink } from "~/components/settings/utils/docs";
 
-const DiscourseGraphExport = ({
+const ExportOptions = ({
   globalSettings,
 }: {
   globalSettings: SettingsSnapshot["globalSettings"];
@@ -123,4 +123,4 @@ const DiscourseGraphExport = ({
   );
 };
 
-export default DiscourseGraphExport;
+export default ExportOptions;
diff --git a/apps/roam/src/components/settings/Settings.tsx b/apps/roam/src/components/settings/Settings.tsx
index fcba1a38e..138c3bcfa 100644
--- a/apps/roam/src/components/settings/Settings.tsx
+++ b/apps/roam/src/components/settings/Settings.tsx
@@ -20,7 +20,6 @@ import renderOverlay from "roamjs-components/util/renderOverlay";
 import DiscourseRelationConfigPanel from "./DiscourseRelationConfigPanel";
 import DEFAULT_RELATION_VALUES from "~/data/defaultDiscourseRelations";
 import discourseConfigRef from "~/utils/discourseConfigRef";
-import DiscourseGraphExport from "./ExportSettings";
 import QuerySettings from "./QuerySettings";
 import AdminPanel from "./AdminPanel";
 import PreferencesGeneral from "./PreferencesGeneral";
@@ -282,14 +281,6 @@ export const SettingsDialog = ({
               />
             }
           />
-          <Tab
-            id={SETTINGS_TAB_IDS.advancedExport}
-            title="Export"
-            className="overflow-y-auto"
-            panel={
-              <DiscourseGraphExport globalSettings={settings.globalSettings} />
-            }
-          />
           <Tabs.Expander />
           {/* Secret Admin Panel */}
           <Tab
diff --git a/apps/roam/src/components/settings/utils/settingsTabs.ts b/apps/roam/src/components/settings/utils/settingsTabs.ts
index 2b4e0a05b..0c0e8e163 100644
--- a/apps/roam/src/components/settings/utils/settingsTabs.ts
+++ b/apps/roam/src/components/settings/utils/settingsTabs.ts
@@ -9,7 +9,6 @@ export const SETTINGS_TAB_IDS = {
   grammarNodes: "grammar-nodes",
   grammarRelations: "grammar-relations",
   advancedQueries: "advanced-queries",
-  advancedExport: "advanced-export",
   admin: "secret-admin-panel",
 } as const;
 
@@ -24,7 +23,8 @@ export const SETTINGS_TAB_ALIASES: Record<string, TabId> = {
   "canvas-shortcuts-personal-settings": SETTINGS_TAB_IDS.featuresCanvas,
   "left-sidebar-personal-settings": SETTINGS_TAB_IDS.featuresLeftSidebar,
   "left-sidebar-global-settings": SETTINGS_TAB_IDS.featuresLeftSidebar,
-  "discourse-graph-export": SETTINGS_TAB_IDS.advancedExport,
+  // Export options now live in the Export dialog.
+  "discourse-graph-export": SETTINGS_TAB_IDS.preferencesGeneral,
   "discourse-nodes": SETTINGS_TAB_IDS.grammarNodes,
   "discourse-relations": SETTINGS_TAB_IDS.grammarRelations,
 };
diff --git a/apps/website/content/roam/guides/sharing-discourse-graph.md b/apps/website/content/roam/guides/sharing-discourse-graph.md
index be5d44b17..b110584e6 100644
--- a/apps/website/content/roam/guides/sharing-discourse-graph.md
+++ b/apps/website/content/roam/guides/sharing-discourse-graph.md
@@ -17,9 +17,7 @@ Demo:
 
 ## Export Options
 
-We have a range of options for customizing the markdown export. These can be found on the `Export` tab of the discourse graph configuration.
-
-![](/docs/roam/settings-export.png)
+We have a range of options for customizing the markdown export. These can be found under `Export options` on the `Export` tab of the export dialog, alongside the export you are about to run.
 
 Here is a brief explanation of each option:
 
diff --git a/apps/website/public/docs/roam/settings-export.png b/apps/website/public/docs/roam/settings-export.png
deleted file mode 100644
index 02291fc57..000000000
Binary files a/apps/website/public/docs/roam/settings-export.png and /dev/null differ