diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp
index a56e7bd6c..04348f36a 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -1016,6 +1016,12 @@ bool CNeutrinoEventList::findEvents(void)
 	int event = 0;
 	t_channel_id channel_id = 0;
 
+	if((m_search_keyword.empty() || m_search_keyword == m_search_autokeyword) && evtlist[selected].eventID != 0)
+	{
+		m_search_keyword = evtlist[selected].description;
+		m_search_autokeyword = m_search_keyword;
+	}
+
 	CEventFinderMenu menu(	&event,
 							&m_search_epg_item,
 							&m_search_keyword,
diff --git a/src/gui/eventlist.h b/src/gui/eventlist.h
index 530b69e8d..c39d5f1eb 100644
--- a/src/gui/eventlist.h
+++ b/src/gui/eventlist.h
@@ -67,6 +67,7 @@ class CNeutrinoEventList
         private:
         int             m_search_epg_item;
         std::string     m_search_keyword;
+	std::string     m_search_autokeyword;
         int             m_search_list;
         t_channel_id    m_search_channel_id;
         t_bouquet_id    m_search_bouquet_id;