diff --git a/sw/qa/uitest/findBar/tdf136941.py b/sw/qa/uitest/findBar/tdf136941.py
index ab94449aefed..c77a7e2a2277 100644
--- a/sw/qa/uitest/findBar/tdf136941.py
+++ b/sw/qa/uitest/findBar/tdf136941.py
@@ -40,6 +40,9 @@ class tdf136941(UITestCase):
         self.xUITest.executeCommand("vnd.sun.star.findbar:FocusToFindbar")
 
         xfind = xWriterDoc.getChild("find")
+        self.ui_test.wait_until_property_is_updated(xfind, 'SelectedText', "Hello")
+        self.assertEqual("Hello", get_state_as_dict(xfind)['SelectedText'])
+
         xfind.executeAction("TYPE", mkPropertyValues({"TEXT": "World"}))
 
         # Without the fix in place, this test would have failed with
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 41636684803b..6c14c2192177 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -1176,6 +1176,7 @@ void ComboBoxUIObject::execute(const OUString& rAction,
 StringMap ComboBoxUIObject::get_state()
 {
     StringMap aMap = WindowUIObject::get_state();
+    aMap["SelectedText"] = mxComboBox->GetSelected();
     return aMap;
 }