diff --git a/superset/assets/javascripts/SqlLab/components/AceEditorWrapper.jsx b/superset/assets/javascripts/SqlLab/components/AceEditorWrapper.jsx
index 5b34edac22e..c524df9e087 100644
--- a/superset/assets/javascripts/SqlLab/components/AceEditorWrapper.jsx
+++ b/superset/assets/javascripts/SqlLab/components/AceEditorWrapper.jsx
@@ -39,6 +39,9 @@ class AceEditorWrapper extends React.PureComponent {
     if (!areArraysShallowEqual(this.props.tables, nextProps.tables)) {
       this.setAutoCompleter(nextProps);
     }
+    if (nextProps.sql !== this.props.sql) {
+      this.setState({ sql: nextProps.sql });
+    }
   }
   textChange(text) {
     this.setState({ sql: text });