diff --git a/draft/application/cms/src/kernel/form/cms_form_select.e b/draft/application/cms/src/kernel/form/cms_form_select.e
index 0e65d184..fd49ad0a 100644
--- a/draft/application/cms/src/kernel/form/cms_form_select.e
+++ b/draft/application/cms/src/kernel/form/cms_form_select.e
@@ -61,6 +61,33 @@ feature -- Element change
 			end
 		end
 
+	select_value_by_text (a_text: detachable READABLE_STRING_GENERAL)
+		local
+			opt: CMS_FORM_SELECT_OPTION
+			l_found: BOOLEAN
+			v: READABLE_STRING_8
+		do
+			if a_text /= Void then
+				v := html_encoded_string (a_text.to_string_32)
+				across
+					options as o
+				loop
+					if o.item.is_same_text (v) then
+						l_found := True
+						o.item.set_is_selected (True)
+					else
+						o.item.set_is_selected (False)
+					end
+				end
+			else
+				across
+					options as o
+				loop
+					o.item.set_is_selected (False)
+				end
+			end
+		end
+
 	set_value (v: detachable WSF_VALUE)
 		do
 			if attached {WSF_STRING} v as s then
diff --git a/draft/application/cms/src/kernel/form/cms_form_select_option.e b/draft/application/cms/src/kernel/form/cms_form_select_option.e
index 93fc981c..3a18067d 100644
--- a/draft/application/cms/src/kernel/form/cms_form_select_option.e
+++ b/draft/application/cms/src/kernel/form/cms_form_select_option.e
@@ -35,6 +35,11 @@ feature -- Status
 			Result := value.same_string (v)
 		end
 
+	is_same_text (v: like text): BOOLEAN
+		do
+			Result := text.same_string (v)
+		end
+
 feature -- Access
 
 	value: READABLE_STRING_32