diff --git a/website/assets/js/pages/osquery-table-details.page.js b/website/assets/js/pages/osquery-table-details.page.js
index dd3d719a95..3e08d7e8df 100644
--- a/website/assets/js/pages/osquery-table-details.page.js
+++ b/website/assets/js/pages/osquery-table-details.page.js
@@ -40,6 +40,8 @@ parasails.registerPage('osquery-table-details', {
       // otherwise, default the filter to be the first supported platform of the currently viewed table.
       this.selectedPlatform = this.tableToDisplay.platforms[0] === 'darwin' ? 'apple' : this.tableToDisplay.platforms[0];
     }
+    // Note: we do not personalize the selected platform on this page based on the user's
+    // current OS because the default table that the /tables url redirects to does not support windows.
   },
   mounted: async function() {
 
diff --git a/website/assets/js/pages/policy-library.page.js b/website/assets/js/pages/policy-library.page.js
index cd334d3e25..6af58a3888 100644
--- a/website/assets/js/pages/policy-library.page.js
+++ b/website/assets/js/pages/policy-library.page.js
@@ -13,7 +13,9 @@ parasails.registerPage('policy-library', {
     //…
   },
   mounted: async function () {
-    //…
+    if(bowser.windows){
+      this.selectedPlatform = 'windows';
+    }
   },
 
   //  ╦╔╗╔╔╦╗╔═╗╦═╗╔═╗╔═╗╔╦╗╦╔═╗╔╗╔╔═╗
diff --git a/website/assets/js/pages/query-library.page.js b/website/assets/js/pages/query-library.page.js
index 08ac6514b1..a31061fdea 100644
--- a/website/assets/js/pages/query-library.page.js
+++ b/website/assets/js/pages/query-library.page.js
@@ -13,7 +13,9 @@ parasails.registerPage('query-library', {
     //…
   },
   mounted: async function () {
-    //…
+    if(bowser.windows){
+      this.selectedPlatform = 'windows';
+    }
   },
 
   //  ╦╔╗╔╔╦╗╔═╗╦═╗╔═╗╔═╗╔╦╗╦╔═╗╔╗╔╔═╗
diff --git a/website/assets/js/pages/vital-details.page.js b/website/assets/js/pages/vital-details.page.js
index 1a9bbdc4f5..e26bc7d3f4 100644
--- a/website/assets/js/pages/vital-details.page.js
+++ b/website/assets/js/pages/vital-details.page.js
@@ -20,6 +20,8 @@ parasails.registerPage('vital-details', {
     // All links to vitals in the on-page navigation have the currently selected filter appended to them, this lets us persist the user's filter when they navigate to a new page.
     if(['#apple','#linux','#windows','#chrome'].includes(window.location.hash)){
       this.selectedPlatform = window.location.hash.split('#')[1];
+    } else if(bowser.windows){
+      this.selectedPlatform = 'windows';
     }
     let columnNamesForThisQuery = [];
     let tableNamesForThisQuery = [];
diff --git a/website/assets/styles/pages/policy-library.less b/website/assets/styles/pages/policy-library.less
index 6a2656624c..a15b6be1af 100644
--- a/website/assets/styles/pages/policy-library.less
+++ b/website/assets/styles/pages/policy-library.less
@@ -135,7 +135,12 @@
       margin-bottom: 16px;
     }
   }
+
   [purpose='platform-filters'] {
+    &.detected-windows {
+      flex-direction: row-reverse;
+    }
+    flex-direction: row;
     border-bottom: 1px solid #E2E4EA;
     margin-bottom: 48px;
     [purpose='platform-filter'] {
diff --git a/website/assets/styles/pages/query-library.less b/website/assets/styles/pages/query-library.less
index 9990bb0444..5428631486 100644
--- a/website/assets/styles/pages/query-library.less
+++ b/website/assets/styles/pages/query-library.less
@@ -142,6 +142,10 @@
     }
   }
   [purpose='platform-filters'] {
+    &.detected-windows {
+      flex-direction: row-reverse;
+    }
+    flex-direction: row;
     border-bottom: 1px solid #E2E4EA;
     margin-bottom: 48px;
     [purpose='platform-filter'] {
diff --git a/website/assets/styles/pages/vital-details.less b/website/assets/styles/pages/vital-details.less
index 6a1607c57b..e81d304cab 100644
--- a/website/assets/styles/pages/vital-details.less
+++ b/website/assets/styles/pages/vital-details.less
@@ -216,6 +216,10 @@
     }
   }
   [purpose='platform-filters'] {
+    &.detected-windows {
+      flex-direction: row-reverse;
+    }
+    flex-direction: row;
     border-bottom: 1px solid #E2E4EA;
     margin-bottom: 32px;
     padding-top: 8px;
diff --git a/website/views/pages/osquery-table-details.ejs b/website/views/pages/osquery-table-details.ejs
index 5c4344711e..8aecd17d7c 100644
--- a/website/views/pages/osquery-table-details.ejs
+++ b/website/views/pages/osquery-table-details.ejs
@@ -6,26 +6,26 @@
           <h2>Tables</h2>
           <p>Fleet uses osquery tables to query operating system, hardware, and software data. Each table provides specific data for analysis and filtering.</p>
         </div>
-        <div purpose="platform-filters" class="d-flex flex-row justify-content-center">
-          <div purpose="platform-filter" :class="[selectedPlatform === 'apple' ? 'selected' : '']" class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('apple')">
+        <div purpose="platform-filters" class="d-flex justify-content-center"  >
+          <div purpose="platform-filter" :class="[selectedPlatform === 'apple' ? 'selected' : '']+' '+[bowser.windows ? 'order-3' : '']" class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('apple')">
             <p class="d-flex align-items-center">
             <img src="/images/os-macos-dark-24x24@2x.png" alt="macOS" class="d-inline">
             <span class="d-none d-md-inline">Apple</span>
             </p>
           </div>
-          <div purpose="platform-filter" :class="[selectedPlatform === 'linux' ? 'selected' : '']" class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('linux')">
+          <div purpose="platform-filter" :class="[selectedPlatform === 'linux' ? 'selected' : '']+' '+[bowser.windows ? 'order-2' : '']"  class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('linux')">
             <p class="d-flex align-items-center">
               <img src="/images/os-linux-dark-24x24@2x.png" alt="Linux" class="d-inline">
               <span class="d-none d-md-inline">Linux</span>
             </p>
           </div>
-          <div purpose="platform-filter" :class="[selectedPlatform === 'windows' ? 'selected' : '']" class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('windows')">
+          <div purpose="platform-filter" :class="[selectedPlatform === 'windows' ? 'selected' : '']+' '+[bowser.windows ? 'order-1' : '']" class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('windows')">
             <p class="d-flex align-items-center">
               <img src="/images/os-windows-dark-24x24@2x.png" alt="Windows" class="d-inline">
               <span class="d-none d-md-inline">Windows</span>
             </p>
           </div>
-          <div purpose="platform-filter" :class="[selectedPlatform === 'chrome' ? 'selected' : '']" class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('chrome')">
+          <div purpose="platform-filter" :class="[selectedPlatform === 'chrome' ? 'selected' : '']+' '+[bowser.windows ? 'order-4' : '']" class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('chrome')">
             <p class="d-flex align-items-center">
               <img src="/images/os-chromeos-dark-24x24@2x.png" alt="Chrome" class="d-inline">
               <span class="d-none d-md-inline">ChromeOS</span>
diff --git a/website/views/pages/policy-library.ejs b/website/views/pages/policy-library.ejs
index 46f1d66760..3065d68770 100644
--- a/website/views/pages/policy-library.ejs
+++ b/website/views/pages/policy-library.ejs
@@ -10,7 +10,7 @@
           <p>Contributions welcome <a target="_blank" href="https://github.com/fleetdm/fleet/blob/main/docs/01-Using-Fleet/standard-query-library/standard-query-library.yml">over on GitHub.</a></p>
         </div>
       </div>
-      <div purpose="platform-filters" class="d-flex flex-row justify-content-center">
+      <div purpose="platform-filters" class="d-flex justify-content-center" :class="[bowser.windows ? 'detected-windows' : '']">
         <div purpose="platform-filter" :class="[selectedPlatform === 'macos' ? 'selected' : '']" class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('macos')">
           <p class="d-flex align-items-center">
           <img src="/images/os-macos-dark-24x24@2x.png" alt="macOS" class="d-inline">
diff --git a/website/views/pages/query-library.ejs b/website/views/pages/query-library.ejs
index 8b29c6467d..9af614a28b 100644
--- a/website/views/pages/query-library.ejs
+++ b/website/views/pages/query-library.ejs
@@ -9,7 +9,7 @@
           <p>A collection of optional queries you can run anytime. Contributions welcome <a target="_blank" href="https://github.com/fleetdm/fleet/edit/main/docs/queries.yml">over on GitHub.</a></p>
         </div>
       </div>
-      <div purpose="platform-filters" class="d-flex flex-row justify-content-center">
+      <div purpose="platform-filters" :class="[bowser.windows ? 'detected-windows' : '']" class="d-flex justify-content-center">
         <div purpose="platform-filter" :class="[selectedPlatform === 'macos' ? 'selected' : '']" class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('macos')">
           <p class="d-flex align-items-center">
           <img src="/images/os-macos-dark-24x24@2x.png" alt="macOS" class="d-inline">
diff --git a/website/views/pages/vital-details.ejs b/website/views/pages/vital-details.ejs
index e0c18603fb..15cc8896f0 100644
--- a/website/views/pages/vital-details.ejs
+++ b/website/views/pages/vital-details.ejs
@@ -8,26 +8,26 @@
           <p>Fleet’s built-in queries for collecting and storing important device information.</p>
         </div>
       </div>
-      <div purpose="platform-filters" class="d-flex flex-row justify-content-center">
-        <div purpose="platform-filter" :class="[selectedPlatform === 'apple' ? 'selected' : '']" class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('apple')">
+      <div purpose="platform-filters" class="d-flex justify-content-center"  >
+        <div purpose="platform-filter" :class="[selectedPlatform === 'apple' ? 'selected' : '']+' '+[bowser.windows ? 'order-3' : '']" class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('apple')">
           <p class="d-flex align-items-center">
           <img src="/images/os-macos-dark-24x24@2x.png" alt="macOS" class="d-inline">
           <span class="d-none d-md-inline">Apple</span>
           </p>
         </div>
-        <div purpose="platform-filter" :class="[selectedPlatform === 'linux' ? 'selected' : '']" class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('linux')">
+        <div purpose="platform-filter" :class="[selectedPlatform === 'linux' ? 'selected' : '']+' '+[bowser.windows ? 'order-2' : '']"  class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('linux')">
           <p class="d-flex align-items-center">
             <img src="/images/os-linux-dark-24x24@2x.png" alt="Linux" class="d-inline">
             <span class="d-none d-md-inline">Linux</span>
           </p>
         </div>
-        <div purpose="platform-filter" :class="[selectedPlatform === 'windows' ? 'selected' : '']" class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('windows')">
+        <div purpose="platform-filter" :class="[selectedPlatform === 'windows' ? 'selected' : '']+' '+[bowser.windows ? 'order-1' : '']" class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('windows')">
           <p class="d-flex align-items-center">
             <img src="/images/os-windows-dark-24x24@2x.png" alt="Windows" class="d-inline">
             <span class="d-none d-md-inline">Windows</span>
           </p>
         </div>
-        <div purpose="platform-filter" :class="[selectedPlatform === 'chrome' ? 'selected' : '']" class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('chrome')">
+        <div purpose="platform-filter" :class="[selectedPlatform === 'chrome' ? 'selected' : '']+' '+[bowser.windows ? 'order-4' : '']" class="d-flex flex-row justify-content-center align-items-center" @click="clickSelectPlatform('chrome')">
           <p class="d-flex align-items-center">
             <img src="/images/os-chromeos-dark-24x24@2x.png" alt="Chrome" class="d-inline">
             <span class="d-none d-md-inline">ChromeOS</span>