diff --git a/frontend/src/metabase/query_builder/components/AggregationPopover.jsx b/frontend/src/metabase/query_builder/components/AggregationPopover.jsx
index 6ce1ff0aa3e0e11ed82f0d66c197dee8627a2394..247e76d34f208852abb6ecf47855f00c1889fb28 100644
--- a/frontend/src/metabase/query_builder/components/AggregationPopover.jsx
+++ b/frontend/src/metabase/query_builder/components/AggregationPopover.jsx
@@ -351,7 +351,8 @@ export default class AggregationPopover extends Component {
             field={fieldId}
             fieldOptions={query.aggregationFieldOptions(agg)}
             onFieldChange={this.onPickField}
-            enableSubDimensions={false}
+            enableSubDimensions={true}
+            preventNumberSubDimensions={true}
           />
         </div>
       );
diff --git a/frontend/src/metabase/query_builder/components/FieldList.jsx b/frontend/src/metabase/query_builder/components/FieldList.jsx
index 07db7733b5309ec73b1ebe683e682ebef8af156c..e8e08b1e27569f7e841c519ea4152fb694ae41f1 100644
--- a/frontend/src/metabase/query_builder/components/FieldList.jsx
+++ b/frontend/src/metabase/query_builder/components/FieldList.jsx
@@ -64,9 +64,7 @@ export default class FieldList extends Component {
         // forward DimensionList props
         useOriginalDimension={this.props.useOriginalDimension}
         enableSubDimensions={this.props.enableSubDimensions}
-        preventNumberSubDimensions={
-          this.props.fieldOptions.preventNumberSubDimensions
-        }
+        preventNumberSubDimensions={this.props.preventNumberSubDimensions}
       />
     );
   }
diff --git a/frontend/test/metabase/scenarios/question/new.cy.spec.js b/frontend/test/metabase/scenarios/question/new.cy.spec.js
index 5e75c778a7bde332b52ca85c4983bce229ae7cda..7b1f21e1974cc97b5b125bdd1ad54d15cd698ac9 100644
--- a/frontend/test/metabase/scenarios/question/new.cy.spec.js
+++ b/frontend/test/metabase/scenarios/question/new.cy.spec.js
@@ -414,7 +414,7 @@ describe("scenarios > question > new", () => {
       });
     });
 
-    it.skip("summarizing by distinct datetime should allow granular selection (metabase#13098)", () => {
+    it("summarizing by distinct datetime should allow granular selection (metabase#13098)", () => {
       // Go straight to orders table in custom questions
       cy.visit("/question/new?database=1&table=2&mode=notebook");
 
@@ -432,7 +432,7 @@ describe("scenarios > question > new", () => {
           .click({ force: true });
       });
       // this should be among the granular selection choices
-      cy.findByText("Hour of day").click();
+      cy.findByText("Hour of Day").click();
     });
 
     it("'read-only' user should be able to resize column width (metabase#9772)", () => {