diff --git a/app/pages/options.html b/app/pages/options.html
index 5c8a54c..17b435c 100644
--- a/app/pages/options.html
+++ b/app/pages/options.html
@@ -436,7 +436,7 @@
                             <button data-category="Grid" data-category="quickFindFields" id="quickFindFields" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--accent">
                                 <i class="material-icons">more_horiz</i>
                                 <span>Quick Find fields</span>
-                            </button data-category="">
+                            </button>
                             <div class="mdl-tooltip" data-mdl-for="quickFindFields">
                                 Displays the quick find columns for the current view.
                             </div>
@@ -459,6 +459,15 @@
                                 Resets blurred fields back to initial state
                             </div>
                         </div>
+                        <div class="mdl-cell mdl-cell--4-col">
+                            <button data-category="Grid" data-category="sendToFXB" id="sendToFXB" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--accent">
+                                <i class="material-icons">code</i>
+                                <span>Open View in FetchXML Builder</span>
+                            </button>
+                            <div class="mdl-tooltip" data-mdl-for="sendToFXB">
+                                Opens the FetchXML query in FetchXML Builder.
+                            </div>
+                        </div>
                     </div>
                 </div>
             </section>
diff --git a/app/scripts/inject/levelup.grid.ts b/app/scripts/inject/levelup.grid.ts
index ab5927a..8c876f0 100644
--- a/app/scripts/inject/levelup.grid.ts
+++ b/app/scripts/inject/levelup.grid.ts
@@ -37,7 +37,25 @@ export class Grid {
         this.utility.messageExtension(resultsArray, 'quickFindFields');
       });
     } else {
-      alert('The current page is not a grid');
+      alert('The current page is not a view');
+    }
+  }
+
+  sendToFXB() {
+    //@ts-ignore
+    if (this.utility.Xrm.Utility.getPageContext) {
+      const view = <Xrm.EntityListPageContext>this.utility.Xrm.Utility.getPageContext().input;
+
+      this.utility.fetch('savedqueries', 'fetchxml', `savedqueryid eq ${view.viewId}`).then((view) => {
+        if (view && view[0].fetchxml) {
+          window.open(
+            `xrmtoolbox:///plugin%3A"FetchXML Builder" /data%3A"${view[0].fetchxml.replaceAll('"', "'")}"`,
+            '_blank'
+          );
+        }
+      });
+    } else {
+      alert('The current page is not a view');
     }
   }
 
@@ -71,7 +89,7 @@ export class Grid {
         viewUrl = `${this.utility.clientUrlForParams}etc=${etc}&viewtype=${viewType}&viewid=${viewId}&newWindow=true&pagetype=entitylist`;
       window.open(viewUrl, '_blank');
     } else {
-      alert('The current page is not a grid');
+      alert('The current page is not a view');
     }
   }
 
@@ -85,5 +103,5 @@ export class Grid {
 }
 
 function setFilter(formDocument: Document, filter: string) {
-  formDocument.querySelectorAll('.wj-row[aria-label="Data"]').forEach((e: HTMLElement) => (e.style.filter = filter));
+  formDocument.querySelectorAll('div[role="gridcell"]').forEach((e: HTMLElement) => (e.style.filter = filter));
 }