diff --git a/superset/assets/javascripts/SqlLab/components/QueryTable.jsx b/superset/assets/javascripts/SqlLab/components/QueryTable.jsx
index b4c04b9eb2b1..aa9aefd04e1b 100644
--- a/superset/assets/javascripts/SqlLab/components/QueryTable.jsx
+++ b/superset/assets/javascripts/SqlLab/components/QueryTable.jsx
@@ -91,6 +91,16 @@ class QueryTable extends React.PureComponent {
         </button>
       );
       q.started = moment(q.startDttm).format('HH:mm:ss');
+      q.querylink = (
+        <div style={{ width: '100px' }}>
+          <a
+            href={this.getQueryLink(q.dbId, q.sql)}
+            className="btn btn-primary btn-xs"
+          >
+            <i className="fa fa-external-link" />Open in SQL Editor
+          </a>
+        </div>
+      );
       q.sql = (
         <HighlightedSql sql={q.sql} rawSql={q.executedSql} shrink maxWidth={60} />
       );
@@ -166,16 +176,6 @@ class QueryTable extends React.PureComponent {
           />
         </div>
       );
-      q.querylink = (
-        <div style={{ width: '100px' }}>
-          <a
-            href={this.getQueryLink(q.dbId, q.sql)}
-            className="btn btn-primary btn-xs"
-          >
-            <i className="fa fa-external-link" />Open in SQL Editor
-          </a>
-        </div>
-      );
       return q;
     }).reverse();
     return (