diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/RecentFilesSEContributor.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/RecentFilesSEContributor.java
index ff240d0cdd39..89d55965052e 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/RecentFilesSEContributor.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/RecentFilesSEContributor.java
@@ -72,7 +72,7 @@ public class RecentFilesSEContributor extends FileSearchEverywhereContributor {
       }
     );
 
-    return res.size() > elementsLimit
+    return elementsLimit > 0 && res.size() > elementsLimit
            ? new ContributorSearchResult<>(res.subList(0, elementsLimit), true)
            : new ContributorSearchResult<>(res);
   }
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java
index ab1ca2c14bf4..3c9cbdd30821 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java
@@ -625,7 +625,8 @@ public class SearchEverywhereUI extends BorderLayoutPanel implements Disposable,
       } else {
         boolean clearBefore = true;
         for (SearchEverywhereContributor contributor : getUsedContributors()) {
-          anyFound |= addContributorItems(contributor, MULTIPLE_CONTRIBUTORS_ELEMENTS_LIMIT, clearBefore);
+          int count = myServiceContributors.contains(contributor) ? -1 : MULTIPLE_CONTRIBUTORS_ELEMENTS_LIMIT; //show ALL items for service contributors
+          anyFound |= addContributorItems(contributor, count, clearBefore);
           clearBefore = false;
         }
       }
@@ -698,6 +699,7 @@ public class SearchEverywhereUI extends BorderLayoutPanel implements Disposable,
   private List<SearchEverywhereContributor> getUsedContributors() {
     SearchEverywhereContributorFilter<String> contributorsFilter =
       (SearchEverywhereContributorFilter<String>) myContributorFilters.get(SearchEverywhereManagerImpl.ALL_CONTRIBUTORS_GROUP_ID);
+
     List<SearchEverywhereContributor> contributors = new ArrayList<>(myServiceContributors);
     myShownContributors.stream()
                        .filter(contributor -> contributorsFilter.isSelected(contributor.getSearchProviderId()))