diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeListPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeListPane.java
index 768eb3724..00184ffc8 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeListPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeListPane.java
@@ -2,7 +2,6 @@ package com.fr.design.mainframe.theme;
 
 import com.fr.base.theme.TemplateTheme;
 import com.fr.base.theme.TemplateThemeConfig;
-import com.fr.base.theme.settings.ThemeThumbnail;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.event.ChangeEvent;
@@ -13,6 +12,7 @@ import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
+import javax.swing.ScrollPaneConstants;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.GridLayout;
@@ -64,14 +64,14 @@ public class TemplateThemeListPane<T extends TemplateTheme> extends BasicPane {
         setLayout(FRGUIPaneFactory.createBorderLayout());
         setPreferredSize(new Dimension(CONTENT_WIDTH, CONTENT_HEIGHT));
 
-        contentListPane.setBorder(BorderFactory.createEmptyBorder(BLOCK_GAP, 0, BLOCK_GAP, 0));
+        contentListPane.setBorder(BorderFactory.createEmptyBorder(BLOCK_GAP, 0, BLOCK_GAP, 10));
         contentListPane.setLayout(new GridLayout(0, BLOCK_COUNT_ROW_LINE, BLOCK_GAP, BLOCK_GAP));
         fillContentListPane();
 
-        JPanel wrapper = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        wrapper.add(contentListPane, BorderLayout.NORTH);
-
-        UIScrollPane scrollPane = new UIScrollPane(wrapper);
+        UIScrollPane scrollPane = new UIScrollPane(contentListPane);
+        scrollPane.setPreferredSize(new Dimension(CONTENT_WIDTH, CONTENT_HEIGHT));
+        scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+        scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
         scrollPane.setBorder(BorderFactory.createEmptyBorder());
         add(scrollPane, BorderLayout.CENTER);