diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridViewCalculationButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridViewCalculationButton.svelte
index f6ef6e6099..851dfb6777 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridViewCalculationButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridViewCalculationButton.svelte
@@ -90,8 +90,15 @@
   const getFieldOptions = (self, calculations, schema) => {
     return Object.entries(schema)
       .filter(([field, fieldSchema]) => {
-        // Only allow numeric fields that are not calculations themselves
-        if (fieldSchema.calculationType || !isNumeric(fieldSchema.type)) {
+        // Don't allow other calculation columns
+        if (fieldSchema.calculationType) {
+          return false
+        }
+        // Only allow numeric columns for most calculation types
+        if (
+          self.type !== CalculationType.COUNT &&
+          !isNumeric(fieldSchema.type)
+        ) {
           return false
         }
         // Don't allow duplicates
@@ -257,6 +264,4 @@
   .group-by {
     grid-column: 2 / 5;
   }
-  span {
-  }
 </style>