diff --git a/src/routes/components/ServerPartsGrid.svelte b/src/routes/components/ServerPartsGrid.svelte
index 9b86125..dc058cf 100644
--- a/src/routes/components/ServerPartsGrid.svelte
+++ b/src/routes/components/ServerPartsGrid.svelte
@@ -171,30 +171,32 @@
         </div>
       {/if}
     </button>
-    {#if gridApi && filterMenuOpen}
-      {#each checkboxFilterDefs as { label, column } (`${uid}-${column}`)}
+    {#if gridApi}
+      <div class={!filterMenuOpen ? 'hidden' : ''}>
+        {#each checkboxFilterDefs as { label, column } (`${uid}-${column}`)}
+          <div class={filterDivClass}>
+            <span>{label}</span>
+            <CheckBoxFilter {gridApi} {rowData} {column} field={column} />
+          </div>
+        {/each}
         <div class={filterDivClass}>
-          <span>{label}</span>
-          <CheckBoxFilter {gridApi} {rowData} {column} field={column} />
+          <span>Capacity</span>
+          <RangeFilter
+            {gridApi}
+            column="capacityGb"
+            placeholder="TB"
+            valueGetter={(value) => value * 1000}
+          />
+        </div>
+        <div class={filterDivClass}>
+          <span>Warranty Months</span>
+          <RangeFilter
+            {gridApi}
+            column="warrantyDays"
+            placeholder="Months"
+            valueGetter={(value) => value * 30}
+          />
         </div>
-      {/each}
-      <div class={filterDivClass}>
-        <span>Capacity</span>
-        <RangeFilter
-          {gridApi}
-          column="capacityGb"
-          placeholder="TB"
-          valueGetter={(value) => value * 1000}
-        />
-      </div>
-      <div class={filterDivClass}>
-        <span>Warranty Months</span>
-        <RangeFilter
-          {gridApi}
-          column="warrantyDays"
-          placeholder="Months"
-          valueGetter={(value) => value * 30}
-        />
       </div>
     {:else if filterMenuOpen}
       <Spinner class="justify-items-end" />