diff --git a/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java b/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java
index 929e10110..bfc7406de 100644
--- a/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java
+++ b/designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java
@@ -286,7 +286,9 @@ public class FormParaWidgetPane extends JPanel {
 
     private int calculateWidgetWindowRowNum() {
         //向上取整
-        int rowNum = (int) Math.ceil((double) predifinedwidgeList.size() / (double) preWidgetShowMaxNum);
+        int eastRowNum = (int) Math.ceil((double) predifinedwidgeList.size() / (double) preWidgetShowMaxNum);
+        int westRowNum = (int) Math.ceil((double) loadWidgetOptions().length / (double) commonWidgetNum);
+        int rowNum = Math.max(eastRowNum, westRowNum);
         rowNum = Math.max(rowNum, 2);
         rowNum = Math.min(rowNum, preWidgetShowMaxRow);
         return rowNum;