diff --git a/website/assets/js/pages/osquery-table-details.page.js b/website/assets/js/pages/osquery-table-details.page.js
index 3c00de7740..b9051dc5a3 100644
--- a/website/assets/js/pages/osquery-table-details.page.js
+++ b/website/assets/js/pages/osquery-table-details.page.js
@@ -35,6 +35,18 @@ parasails.registerPage('osquery-table-details', {
 
   },
   mounted: async function() {
+
+    // Check the URL to see if a platformFilter was provided.
+    if(window.location.search) {
+      // https://caniuse.com/mdn-api_urlsearchparams_get
+      let possibleSearchParamsToFilterBy = new URLSearchParams(window.location.search);
+      let platformToFilterBy = possibleSearchParamsToFilterBy.get('platformFilter');
+      // If the provided platform matches a key in the userFriendlyPlatformNames array, we'll set this.selectedPlatform.
+      if(platformToFilterBy && this.userFriendlyPlatformNames[platformToFilterBy]){
+        this.selectedPlatform = platformToFilterBy;
+      }
+    }
+
     // sort the array of all tables
     this.allTables = this.allTables.sort((a, b)=>{
       if(a.title < b.title){
diff --git a/website/views/pages/osquery-table-details.ejs b/website/views/pages/osquery-table-details.ejs
index 2cbca7d9c7..9911891da9 100644
--- a/website/views/pages/osquery-table-details.ejs
+++ b/website/views/pages/osquery-table-details.ejs
@@ -41,7 +41,7 @@
         </div>
         <div class="d-flex d-lg-none pt-3" v-if="showTableNav">
           <div purpose="mobile-table-of-contents">
-            <a class="d-block" :class="[tableToDisplay.title === table.title ? 'active' : '']" :href="table.url" v-for="table in filteredTables">{{table.title}} <span purpose="evented-table-icon" v-if="table.evented"><img alt="evented table" src="/images/icon-evented-12x12@2x.png" ></span></a>
+            <a class="d-block" :class="[tableToDisplay.title === table.title ? 'active' : '']" :href="table.url+[selectedPlatform !== 'all' ? '?platformFilter='+encodeURIComponent(selectedPlatform) : '' ]" v-for="table in filteredTables">{{table.title}} <span purpose="evented-table-icon" v-if="table.evented"><img alt="evented table" src="/images/icon-evented-12x12@2x.png" ></span></a>
           </div>
         </div>
       </div>
@@ -59,7 +59,7 @@
           </div>
           <div style="position: relative;">
             <div purpose="table-of-contents">
-              <a class="d-block" :class="[tableToDisplay.title === table.title ? 'active' : '']" :href="table.url" v-for="table in filteredTables">{{table.title}} <span purpose="evented-table-icon" v-if="table.evented"><img alt="evented table" src="/images/icon-evented-12x12@2x.png" ></span></a>
+              <a class="d-block" :class="[tableToDisplay.title === table.title ? 'active' : '']" :href="table.url+[selectedPlatform !== 'all' ? '?platformFilter='+encodeURIComponent(selectedPlatform) : '' ]" v-for="table in filteredTables">{{table.title}} <span purpose="evented-table-icon" v-if="table.evented"><img alt="evented table" src="/images/icon-evented-12x12@2x.png" ></span></a>
             </div>
             <div purpose="overflow-shadow" class="d-none d-lg-block"></div>
           </div>