diff --git a/src/views/results/index.ts b/src/views/results/index.ts
index ec437a15..f2e92c72 100644
--- a/src/views/results/index.ts
+++ b/src/views/results/index.ts
@@ -264,6 +264,7 @@ async function runHandler(options?: StatementInfo) {
   vscode.commands.executeCommand('vscode-db2i.dove.close');
 
   if (optionsIsValid || (editor && editor.document.languageId === `sql`)) {
+    const eol = editor.document.eol === vscode.EndOfLine.CRLF ? `\r\n` : `\n`;
     let chosenView = resultSetProvider;
 
     const useWindow = (title: string, column?: ViewColumn) => {
@@ -377,8 +378,10 @@ async function runHandler(options?: StatementInfo) {
               updatableTable = refs[0];
             }
 
+            const basicSelect = statementDetail.content.split(eol).filter(line => !line.trimStart().startsWith(`--`)).join(eol);
+
             chosenView.setScrolling({ // Never errors
-              basicSelect: statementDetail.content,
+              basicSelect: basicSelect,
               withCancel: inWindow,
               ref: updatableTable,
               parameters,