diff --git a/files/feeds.py b/files/feeds.py
index 2a78bc9..5e83953 100644
--- a/files/feeds.py
+++ b/files/feeds.py
@@ -120,7 +120,7 @@ class SearchRSSFeed(Feed):
             # same as on files.views.MediaSearch: move this processing to a prepare_query function
             query = helpers.clean_query(query)
             q_parts = [
-                q_part.strip("y")
+                q_part.rstrip("y")
                 for q_part in query.split()
                 if q_part not in STOP_WORDS
             ]
diff --git a/files/views.py b/files/views.py
index 76477df..6f7e7df 100644
--- a/files/views.py
+++ b/files/views.py
@@ -735,7 +735,7 @@ class MediaSearch(APIView):
             # move this processing to a prepare_query function
             query = clean_query(query)
             q_parts = [
-                q_part.strip("y")
+                q_part.rstrip("y")
                 for q_part in query.split()
                 if q_part not in STOP_WORDS
             ]