diff --git a/epgsearch/src/EPGSearch.py b/epgsearch/src/EPGSearch.py
index 00bde6da3..616116910 100644
--- a/epgsearch/src/EPGSearch.py
+++ b/epgsearch/src/EPGSearch.py
@@ -764,6 +764,8 @@ def yellowButtonPressed(self):
 			event = self["list"].getCurrent()[0]
 			if event:
 				searchText = event.getEventName()
+			elif self.currSearch != "":
+				searchText = self.currSearch
 		self.session.openWithCallback(
 			self.searchEPG,
 			VirtualKeyBoard,