diff --git a/plugins/ktstandard/workflow/FolderAssociator.php b/plugins/ktstandard/workflow/FolderAssociator.php
index 6cf580a..ce3b6cd 100644
--- a/plugins/ktstandard/workflow/FolderAssociator.php
+++ b/plugins/ktstandard/workflow/FolderAssociator.php
@@ -100,7 +100,7 @@ class FolderWorkflowAssignmentFolderAction extends KTFolderAction {
         $oTemplate =& $this->oValidator->validateTemplate('ktstandard/workflow/folderconfigure');
         $fields = array();
         
-        $aWorkflows = KTWorkflow::getList('start_state_id IS NOT NULL');
+        $aWorkflows = KTWorkflow::getList('start_state_id IS NOT NULL AND enabled = 1');
         $aVocab = array();
         $aVocab[] = _kt('No automatic workflow.');
         foreach ($aWorkflows as $oWorkflow) {
diff --git a/plugins/ktstandard/workflow/TypeAssociator.php b/plugins/ktstandard/workflow/TypeAssociator.php
index d51d54f..6b8fd85 100644
--- a/plugins/ktstandard/workflow/TypeAssociator.php
+++ b/plugins/ktstandard/workflow/TypeAssociator.php
@@ -101,7 +101,7 @@ class WorkflowTypeAllocationDispatcher extends KTAdminDispatcher {
         $sQuery = 'SELECT document_type_id, workflow_id FROM ' . KTUtil::getTableName('type_workflow_map');
         $aParams = array();
         $res = DBUtil::getResultArray(array($sQuery, $aParams));
-        $aWorkflows = KTWorkflow::getList('start_state_id IS NOT NULL');
+        $aWorkflows = KTWorkflow::getList('start_state_id IS NOT NULL AND enabled = 1');
         $aTypes = DocumentType::getList();
         
         $aTypeMapping = array();