diff --git a/src/FactSystem/FactGroup.cc b/src/FactSystem/FactGroup.cc
index ee41fdc34c592a495dec30d3797b16fe7e6bf768..ad11c2400d9d47fccd35b9c084955e613b35e62b 100644
--- a/src/FactSystem/FactGroup.cc
+++ b/src/FactSystem/FactGroup.cc
@@ -105,6 +105,7 @@ void FactGroup::_addFact(Fact* fact, const QString& name)
         fact->setMetaData(_nameToFactMetaDataMap[name]);
     }
     _nameToFactMap[name] = fact;
+    _factNames.append(name);
 }
 
 void FactGroup::_addFactGroup(FactGroup* factGroup, const QString& name)
diff --git a/src/FactSystem/FactGroup.h b/src/FactSystem/FactGroup.h
index 605844abcd6a02666c793d10c176159824ac02c8..78a97fcb60c79ddc140b68a7476d50ae2e8930f2 100644
--- a/src/FactSystem/FactGroup.h
+++ b/src/FactSystem/FactGroup.h
@@ -38,7 +38,7 @@ public:
     /// @return FactGroup for specified name, NULL if not found
     Q_INVOKABLE FactGroup* getFactGroup(const QString& name);
 
-    QStringList factNames(void) const { return _nameToFactMap.keys(); }
+    QStringList factNames(void) const { return _factNames; }
     QStringList factGroupNames(void) const { return _nameToFactGroupMap.keys(); }
 
 protected:
@@ -59,7 +59,7 @@ protected:
     QMap<QString, Fact*>            _nameToFactMap;
     QMap<QString, FactGroup*>       _nameToFactGroupMap;
     QMap<QString, FactMetaData*>    _nameToFactMetaDataMap;
-
+    QStringList                     _factNames;
 };
 
 #endif