diff --git a/themes/grav/templates/forms/fields/select/select.html.twig b/themes/grav/templates/forms/fields/select/select.html.twig
index ef34f0ed..01c8dfce 100644
--- a/themes/grav/templates/forms/fields/select/select.html.twig
+++ b/themes/grav/templates/forms/fields/select/select.html.twig
@@ -15,7 +15,7 @@
                 {% if field.form %}form="{{ field.form }}"{% endif %}
                 >
             {% for key, text in field.options %}
-            <option {% if key == value %}selected="selected"{% endif %} value="{{ field.multiple ? text : key }}">{{ text|tu }}</option>
+            <option {% if key == value or (field.multiple and text in value) %}selected="selected"{% endif %} value="{{ field.multiple ? text : key }}">{{ text|tu }}</option>
             {% endfor %}
         </select>
     </div>