diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditor.jsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditor.jsx
index 23a4a48fec41de5793b86fa143a8f90af50693c1..0f31344cc7dc3a681c40851fd9eeb495005d9657 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditor.jsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditor.jsx
@@ -261,7 +261,7 @@ function DatasetEditor(props) {
 
   const focusFirstField = useCallback(() => {
     const [firstField] = fields;
-    setFocusedFieldRef(firstField.field_ref);
+    setFocusedFieldRef(firstField?.field_ref);
   }, [fields, setFocusedFieldRef]);
 
   useEffect(() => {
diff --git a/frontend/test/metabase/scenarios/models/reproductions/23421-visualization-settins-breaks-ui.cy.spec.js b/frontend/test/metabase/scenarios/models/reproductions/23421-visualization-settins-breaks-ui.cy.spec.js
index 90ccbaadae2a95f2fdc6c33200fbe2f128dcd758..d6babb05f03d310df7edf61fd00b0345aac2e7ef 100644
--- a/frontend/test/metabase/scenarios/models/reproductions/23421-visualization-settins-breaks-ui.cy.spec.js
+++ b/frontend/test/metabase/scenarios/models/reproductions/23421-visualization-settins-breaks-ui.cy.spec.js
@@ -15,7 +15,7 @@ const questionDetails = {
   dataset: true,
 };
 
-describe.skip("issue 23421", () => {
+describe("issue 23421", () => {
   beforeEach(() => {
     restore();
     cy.signInAsAdmin();