diff --git a/src/testdir/test_vim9_enum.vim b/src/testdir/test_vim9_enum.vim
index 6e10e0c..ceea32f 100644
--- a/src/testdir/test_vim9_enum.vim
+++ b/src/testdir/test_vim9_enum.vim
@@ -964,7 +964,7 @@
 
     enum Star
       Gemini,
-      Orion,
+      Orion
     endenum
     assert_equal(3, test_refcount(Star))
     assert_equal(2, test_refcount(Star.Gemini))
@@ -1473,4 +1473,17 @@
   v9.CheckSourceSuccess(lines)
 enddef
 
+" Test for using "values" in an enum class variable
+def Test_use_enum_values_in_class_variable()
+  var lines =<< trim END
+    vim9script
+    enum Dir
+      North, South
+      static const dirs: list<Dir> = Dir.values
+    endenum
+    assert_equal([Dir.North, Dir.South], Dir.dirs)
+  END
+  v9.CheckSourceSuccess(lines)
+enddef
+
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/src/version.c b/src/version.c
index e96f17c..b56b6d3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    226,
+/**/
     225,
 /**/
     224,
diff --git a/src/vim9class.c b/src/vim9class.c
index 6963491..2d60ba9 100644
--- a/src/vim9class.c
+++ b/src/vim9class.c
@@ -2056,6 +2056,11 @@
 	    if (enum_parse_values(eap, cl, line, &classmembers,
 					&num_enum_values, &enum_end) == FAIL)
 		break;
+
+	    if (enum_end)
+		// Add the enum "values" class variable.
+		enum_add_values_member(cl, &classmembers, num_enum_values,
+							&type_list);
 	    continue;
 	}
 
@@ -2368,9 +2373,9 @@
 
     vim_free(theline);
 
-    if (success && is_enum)
-	// Add the enum "values" class variable.
-	enum_add_values_member(cl, &classmembers, num_enum_values, &type_list);
+    if (success && is_enum && num_enum_values == 0)
+	// Empty enum statement. Add an empty "values" class variable
+	enum_add_values_member(cl, &classmembers, 0, &type_list);
 
     /*
      * Check a few things