diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/editDocument.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/editDocument.php
index 902af17..41fa0c9 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/editDocument.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/editDocument.php
@@ -171,7 +171,8 @@ class KTEditDocumentDispatcher extends KTStandardDispatcher {
 
 		// FIXME handle true generic document DATA (e.g. title).
 
-        $activesets = KTFieldset::getGenericFieldsets();
+        // $activesets = KTFieldset::getGenericFieldsets();
+        $activesets =& KTMetadataUtil::fieldsetsForDocument($oDocument);
         foreach ($activesets as $oFieldset) {
             array_push($fieldsets, $oFieldset);
         }