diff --git a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java
index da5b35aee..c1d5c6763 100644
--- a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java
+++ b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java
@@ -88,16 +88,17 @@ public class DataConfigService {
 
     public List<DataConfig> getAllDataConfigList(final boolean withLabelType, final boolean withRoleType, final boolean available,
             final List<String> idList) {
-        final List<DataConfig> list = dataConfigBhv.selectList(cb -> {
+        return dataConfigBhv.selectList(cb -> {
             if (available) {
                 cb.query().setAvailable_Equal(Constants.T);
             }
             if (idList != null) {
                 cb.query().setId_InScope(idList);
             }
+            cb.query().addOrderBy_SortOrder_Asc();
+            cb.query().addOrderBy_Name_Asc();
             cb.fetchFirst(fessConfig.getPageDataConfigMaxFetchSizeAsInteger());
         });
-        return list;
     }
 
     public OptionalEntity<DataConfig> getDataConfig(final String id) {
diff --git a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java
index 93cc90b00..79175576c 100644
--- a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java
+++ b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java
@@ -94,16 +94,17 @@ public class FileConfigService {
 
     public List<FileConfig> getAllFileConfigList(final boolean withLabelType, final boolean withRoleType, final boolean available,
             final List<String> idList) {
-        final List<FileConfig> list = fileConfigBhv.selectList(cb -> {
+        return fileConfigBhv.selectList(cb -> {
             if (available) {
                 cb.query().setAvailable_Equal(Constants.T);
             }
             if (idList != null) {
                 cb.query().setId_InScope(idList);
             }
+            cb.query().addOrderBy_SortOrder_Asc();
+            cb.query().addOrderBy_Name_Asc();
             cb.fetchFirst(fessConfig.getPageFileConfigMaxFetchSizeAsInteger());
         });
-        return list;
     }
 
     public OptionalEntity<FileConfig> getFileConfig(final String id) {
diff --git a/src/main/java/org/codelibs/fess/app/service/WebConfigService.java b/src/main/java/org/codelibs/fess/app/service/WebConfigService.java
index f23ff9a1a..8186d16d7 100644
--- a/src/main/java/org/codelibs/fess/app/service/WebConfigService.java
+++ b/src/main/java/org/codelibs/fess/app/service/WebConfigService.java
@@ -102,17 +102,17 @@ public class WebConfigService {
 
     public List<WebConfig> getAllWebConfigList(final boolean withLabelType, final boolean withRoleType, final boolean available,
             final List<String> idList) {
-        final List<WebConfig> list = webConfigBhv.selectList(cb -> {
+        return webConfigBhv.selectList(cb -> {
             if (available) {
                 cb.query().setAvailable_Equal(Constants.T);
             }
             if (idList != null) {
                 cb.query().setId_InScope(idList);
             }
+            cb.query().addOrderBy_SortOrder_Asc();
+            cb.query().addOrderBy_Name_Asc();
             cb.fetchFirst(fessConfig.getPageWebConfigMaxFetchSizeAsInteger());
         });
-
-        return list;
     }
 
     public OptionalEntity<WebConfig> getWebConfig(final String id) {