diff --git a/packages/api/src/controllers/sessions.js b/packages/api/src/controllers/sessions.js
index e543b7a0a..3b6c68100 100644
--- a/packages/api/src/controllers/sessions.js
+++ b/packages/api/src/controllers/sessions.js
@@ -154,7 +154,14 @@ module.exports = {
 
     logger.info({ sesid, sql }, 'Processing query');
     this.dispatchMessage(sesid, 'Query execution started');
-    session.subprocess.send({ msgtype: 'executeQuery', sql, autoCommit, autoDetectCharts, limitRows, frontMatter });
+    session.subprocess.send({
+      msgtype: 'executeQuery',
+      sql,
+      autoCommit,
+      autoDetectCharts: autoDetectCharts || !!frontMatter?.['selected-chart'],
+      limitRows,
+      frontMatter,
+    });
 
     return { state: 'ok' };
   },
diff --git a/packages/web/src/query/ResultTabs.svelte b/packages/web/src/query/ResultTabs.svelte
index 53fb2795e..18d01b50f 100644
--- a/packages/web/src/query/ResultTabs.svelte
+++ b/packages/web/src/query/ResultTabs.svelte
@@ -91,6 +91,12 @@
       props: {
         jslid: info.jslid,
         initialCharts: info.charts,
+        onCloseChart: () => {
+          charts = charts.filter(x => x.resultIndex !== info.resultIndex);
+          onSetFrontMatterField?.(`chart-${info.resultIndex + 1}`, undefined);
+          const value = _.findIndex(allTabs, x => x.isResult && x.resultIndex === info.resultIndex);
+          domTabs.setValue(value >= 0 ? value : 0);
+        },
         onEditDefinition: definition => {
           onSetFrontMatterField?.(`chart-${info.resultIndex + 1}`, definition ?? undefined);
         },
@@ -148,14 +154,14 @@
 
   export function openCurrentChart() {
     const currentIndex = domTabs.getValue();
-    console.log('Current index:', currentIndex);
+    // console.log('Current index:', currentIndex);
     const currentTab = allTabs[currentIndex];
-    console.log('Current tab:', currentTab);
+    // console.log('Current tab:', currentTab);
     if (currentTab?.isChart) {
       return;
     }
     const resultIndex = currentTab?.resultIndex;
-    console.log('Result index:', resultIndex);
+    // console.log('Result index:', resultIndex);
     if (resultIndex != null) {
       handleOpenChart(resultIndex);
     }