diff --git a/workflow/engine/classes/model/map/AppFolderMapBuilder.php b/workflow/engine/classes/model/map/AppFolderMapBuilder.php
index ef09bf21c..dd5998f71 100644
--- a/workflow/engine/classes/model/map/AppFolderMapBuilder.php
+++ b/workflow/engine/classes/model/map/AppFolderMapBuilder.php
@@ -69,7 +69,7 @@ class AppFolderMapBuilder
 
         $tMap->addColumn('FOLDER_PARENT_UID', 'FolderParentUid', 'string', CreoleTypes::VARCHAR, true, 32);
 
-        $tMap->addColumn('FOLDER_NAME', 'FolderName', 'string', CreoleTypes::LONGVARCHAR, true, null);
+        $tMap->addColumn('FOLDER_NAME', 'FolderName', 'string', CreoleTypes::VARCHAR, true, 512);
 
         $tMap->addColumn('FOLDER_CREATE_DATE', 'FolderCreateDate', 'int', CreoleTypes::TIMESTAMP, true, null);
 
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 348415bde..cf5b55ae2 100644
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -3016,9 +3016,16 @@
         </vendor>
         <column name="FOLDER_UID" type="VARCHAR" size="32" required="true" default="" primaryKey="true"/>
         <column name="FOLDER_PARENT_UID" type="VARCHAR" size="32" required="true" default=""/>
-        <column name="FOLDER_NAME" type="LONGVARCHAR" required="true"/>
+        <column name="FOLDER_NAME" type="VARCHAR" size="512" required="true"/>
         <column name="FOLDER_CREATE_DATE" type="TIMESTAMP" required="true"/>
         <column name="FOLDER_UPDATE_DATE" type="TIMESTAMP" required="true"/>
+        <index name="indexFolderName">
+            <index-column name="FOLDER_NAME"/>
+            <vendor type="mysql">
+                <parameter name="Table" value="APP_FOLDER"/>
+                <parameter name="Key_name" value="indexFolderName"/>
+            </vendor>
+        </index>
     </table>
     <table name="FIELD_CONDITION">
         <vendor type="mysql">
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index eb0682aad..5b4eb4a6c 100644
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -1408,10 +1408,11 @@ CREATE TABLE `APP_FOLDER`
 (
 	`FOLDER_UID` VARCHAR(32) default '' NOT NULL,
 	`FOLDER_PARENT_UID` VARCHAR(32) default '' NOT NULL,
-	`FOLDER_NAME` MEDIUMTEXT  NOT NULL,
+	`FOLDER_NAME` VARCHAR(512)  NOT NULL,
 	`FOLDER_CREATE_DATE` DATETIME  NOT NULL,
 	`FOLDER_UPDATE_DATE` DATETIME  NOT NULL,
-	PRIMARY KEY (`FOLDER_UID`)
+	PRIMARY KEY (`FOLDER_UID`),
+	KEY `indexFolderName`(`FOLDER_NAME`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Folder System PM Documents';
 #-----------------------------------------------------------------------------
 #-- FIELD_CONDITION