diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py
index 5778d5f4c8d..3b05f504c44 100644
--- a/scripts/xyz_grid.py
+++ b/scripts/xyz_grid.py
@@ -558,6 +558,8 @@ def process_axis(opt, vals, vals_dropdown):
                 valslist = opt.prepare(vals)
             else:
                 valslist = csv_string_to_list_strip(vals)
+                if opt.choices is not None:
+                    valslist = [x for x in valslist if x in opt.choices()]
 
             if opt.type == int:
                 valslist_ext = []