diff --git a/src/plugins/texteditor/snippets/snippetassistcollector.cpp b/src/plugins/texteditor/snippets/snippetassistcollector.cpp
index d7a8e37a1b4..ba3725a5389 100644
--- a/src/plugins/texteditor/snippets/snippetassistcollector.cpp
+++ b/src/plugins/texteditor/snippets/snippetassistcollector.cpp
@@ -58,10 +58,23 @@ SnippetAssistCollector::SnippetAssistCollector(const QString &groupId, const QIc
     , m_order(order)
 {}
 
+void SnippetAssistCollector::setGroupId(const QString &gid)
+{
+    m_groupId = gid;
+}
+
+QString SnippetAssistCollector::groupId() const
+{
+    return m_groupId;
+}
+
 QList<AssistProposalItemInterface *> SnippetAssistCollector::collect() const
 {
     QList<AssistProposalItemInterface *> snippets;
+    if (m_groupId.isEmpty())
+        return snippets;
     appendSnippets(&snippets, m_groupId, m_icon, m_order);
-    appendSnippets(&snippets, QLatin1String(Constants::TEXT_SNIPPET_GROUP_ID), m_icon, m_order);
+    if (m_groupId != Constants::TEXT_SNIPPET_GROUP_ID)
+        appendSnippets(&snippets, Constants::TEXT_SNIPPET_GROUP_ID, m_icon, m_order);
     return snippets;
 }
diff --git a/src/plugins/texteditor/snippets/snippetassistcollector.h b/src/plugins/texteditor/snippets/snippetassistcollector.h
index 4e365ce0731..1a565127547 100644
--- a/src/plugins/texteditor/snippets/snippetassistcollector.h
+++ b/src/plugins/texteditor/snippets/snippetassistcollector.h
@@ -40,6 +40,9 @@ class TEXTEDITOR_EXPORT SnippetAssistCollector
 public:
     SnippetAssistCollector(const QString &groupId, const QIcon &icon, int order = 0);
 
+    void setGroupId(const QString &gid);
+    QString groupId() const;
+
     QList<AssistProposalItemInterface *> collect() const;
 
 private: