diff --git a/src/chart.js b/src/chart.js
new file mode 100644
index 0000000..415b755
--- /dev/null
+++ b/src/chart.js
@@ -0,0 +1,34 @@
+import dereference from 'react-chart-editor/lib/lib/dereference'
+
+export function getDataSourcesFromSqlResult (sqlResult) {
+  if (!sqlResult) {
+    return {}
+  }
+  const dataSorces = {}
+  const matrix = sqlResult.values
+  const [row] = matrix
+  const transposedMatrix = row.map((value, column) => matrix.map(row => row[column]))
+  sqlResult.columns.forEach((column, index) => {
+    dataSorces[column] = transposedMatrix[index]
+  })
+  return dataSorces
+}
+
+export function getOptionsFromDataSources (dataSources) {
+  return Object.keys(dataSources).map(name => ({
+    value: name,
+    label: name
+  }))
+}
+
+export function getChartStateForSave (state, dataSources) {
+  // we don't need to save the data, only settings
+  // so we modify state.data using dereference
+  const stateCopy = JSON.parse(JSON.stringify(state))
+  const emptySources = {}
+  for (const key in dataSources) {
+    emptySources[key] = []
+  }
+  dereference(stateCopy.data, emptySources)
+  return stateCopy
+}
diff --git a/src/components/Chart.vue b/src/components/Chart.vue
index d980a23..57cafca 100644
--- a/src/components/Chart.vue
+++ b/src/components/Chart.vue
@@ -12,6 +12,7 @@
     :dataSourceOptions="dataSourceOptions"
     :plotly="plotly"
     @onUpdate="update"
+    @onRender="go"
     :useResizeHandler="true"
     :debug="true"
     :advancedTraceTypeSelector="true"
@@ -26,6 +27,11 @@ import plotly from 'plotly.js/dist/plotly'
 import 'react-chart-editor/lib/react-chart-editor.min.css'
 
 import PlotlyEditor from 'react-chart-editor'
+import {
+  getOptionsFromDataSources,
+  getDataSourcesFromSqlResult,
+  getChartStateForSave
+} from '@/chart'
 import dereference from 'react-chart-editor/lib/lib/dereference'
 
 export default {
@@ -46,23 +52,10 @@ export default {
   },
   computed: {
     dataSources () {
-      if (!this.sqlResult) {
-        return {}
-      }
-      const dataSorces = {}
-      const matrix = this.sqlResult.values
-      const [row] = matrix
-      const transposedMatrix = row.map((value, column) => matrix.map(row => row[column]))
-      this.sqlResult.columns.forEach((column, index) => {
-        dataSorces[column] = transposedMatrix[index]
-      })
-      return dataSorces
+      return getDataSourcesFromSqlResult(this.sqlResult)
     },
     dataSourceOptions () {
-      return Object.keys(this.dataSources).map(name => ({
-        value: name,
-        label: name
-      }))
+      return getOptionsFromDataSources(this.dataSources)
     }
   },
   watch: {
@@ -73,20 +66,15 @@ export default {
     }
   },
   methods: {
+    go (data, layout, frames) {
+      // TODO: check changes and enable Save button if needed
+    },
     update (data, layout, frames) {
       this.state = { data, layout, frames }
       this.$emit('update')
     },
     getChartStateForSave () {
-      // we don't need to save the data, only settings
-      // so we modify state.data using dereference
-      const stateCopy = JSON.parse(JSON.stringify(this.state))
-      const emptySources = {}
-      for (const key in this.dataSources) {
-        emptySources[key] = []
-      }
-      dereference(stateCopy.data, emptySources)
-      return stateCopy
+      return getChartStateForSave(this.state, this.dataSources)
     }
   }
 }
diff --git a/src/components/MainMenu.vue b/src/components/MainMenu.vue
index 2cebdf9..09c7853 100644
--- a/src/components/MainMenu.vue
+++ b/src/components/MainMenu.vue
@@ -77,7 +77,8 @@ export default {
         return false
       }
       const tabIndex = this.currentQuery.tabIndex
-      return this.$store.state.tabs[tabIndex].isUnsaved
+      const tab = this.$store.state.tabs[tabIndex]
+      return tab && tab.isUnsaved
     },
     isPredefined () {
       if (this.currentQuery) {
diff --git a/src/components/Tab.vue b/src/components/Tab.vue
index 4e6e360..85c83dc 100644
--- a/src/components/Tab.vue
+++ b/src/components/Tab.vue
@@ -139,9 +139,6 @@ export default {
       // 40 - height of table header
       const freeSpace = bottomPane.offsetHeight - 88 - 42 - 30 - 5 - 40
       this.tableViewHeight = freeSpace - (freeSpace % 40)
-    },
-    getChartStateForSave () {
-      return this.$refs.chart.getChartStateForSave()
     }
   }
 }
diff --git a/src/storedQueries.js b/src/storedQueries.js
index 8957c35..4221242 100644
--- a/src/storedQueries.js
+++ b/src/storedQueries.js
@@ -25,7 +25,7 @@ export default {
     const value = {
       id: queryTab.isPredefined ? nanoid() : queryTab.id,
       query: queryTab.query,
-      chart: queryTab.getChartStateForSave(),
+      chart: queryTab.$refs.chart.getChartStateForSave(),
       name: newName || queryTab.initName
     }
 
diff --git a/tests/unit/storedQueries.spec.js b/tests/unit/storedQueries.spec.js
index 3ddffc7..c76351e 100644
--- a/tests/unit/storedQueries.spec.js
+++ b/tests/unit/storedQueries.spec.js
@@ -187,15 +187,19 @@ describe('storedQueries.js', () => {
       query: 'select * from foo',
       chart: [],
       initName: null,
-      getChartStateForSave () {
-        return []
+      $refs: {
+        chart: {
+          getChartStateForSave () {
+            return ['chart']
+          }
+        }
       }
     }
     const value = storedQueries.save(tab, 'foo')
     expect(value.id).to.equal(tab.id)
     expect(value.name).to.equal('foo')
     expect(value.query).to.equal(tab.query)
-    expect(value.chart).to.eql(tab.getChartStateForSave())
+    expect(value.chart).to.eql(['chart'])
     expect(value).to.have.property('createdAt').which.within(now, nowPlusMinute)
     const queries = storedQueries.getStoredQueries()
     expect(JSON.stringify(queries)).to.equal(JSON.stringify([value]))
@@ -207,8 +211,12 @@ describe('storedQueries.js', () => {
       query: 'select * from foo',
       chart: [],
       initName: null,
-      getChartStateForSave () {
-        return []
+      $refs: {
+        chart: {
+          getChartStateForSave () {
+            return ['chart']
+          }
+        }
       }
     }
 
@@ -223,7 +231,7 @@ describe('storedQueries.js', () => {
     expect(second.id).to.equal(first.id)
     expect(second.name).to.equal(first.name)
     expect(second.query).to.equal(tab.query)
-    expect(second.chart).to.eql(first.chart)
+    expect(second.chart).to.eql(['chart'])
     expect(new Date(second.createdAt).getTime()).to.equal(first.createdAt.getTime())
   })
 
@@ -235,8 +243,12 @@ describe('storedQueries.js', () => {
       query: 'select * from foo',
       chart: [],
       initName: 'foo predefined',
-      getChartStateForSave () {
-        return []
+      $refs: {
+        chart: {
+          getChartStateForSave () {
+            return ['chart']
+          }
+        }
       },
       isPredefined: true
     }
@@ -247,7 +259,7 @@ describe('storedQueries.js', () => {
     expect(queries[0]).to.have.property('id').which.not.equal(tab.id)
     expect(queries[0].name).to.equal('foo')
     expect(queries[0].query).to.equal(tab.query)
-    expect(queries[0].chart).to.eql(tab.getChartStateForSave())
+    expect(queries[0].chart).to.eql(['chart'])
     expect(new Date(queries[0].createdAt)).to.be.within(now, nowPlusMinute)
   })
 })