diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java
index 26543691f3..fa7323586f 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java
@@ -1,5 +1,6 @@
 package com.fr.design.data.datapane.connect;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.pool.DBCPConnectionPoolAttr;
 import com.fr.design.dialog.BasicPane;
@@ -49,7 +50,7 @@ public class AdvancePane extends BasicPane {
 
         JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSizeDbcp, columnDbcp, 11, 11);
         jPanel.add(contextPane, BorderLayout.CENTER);
-        this.add(jPanel);
+        this.add(BidiUtils.applyOrientationByLocale(jPanel));
     }
 
 
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java
index 8789a39a18..4188fdf105 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java
@@ -1,5 +1,6 @@
 package com.fr.design.data.datapane.connect;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.security.ssl.Ssl;
 import com.fr.data.security.ssl.SslException;
@@ -84,9 +85,12 @@ public class SslPane extends BasicPane {
         };
         usingSsl.setSelected(true);
         contextPane = TableLayoutHelper.createGapTableLayoutPane(usingComps, new double[]{p, p, p, p}, columnSize, 11, 11);
-        jPanel.add(usingSsl, BorderLayout.NORTH);
+        JPanel sslPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        sslPane.add(usingSsl, BorderLayout.LINE_START);
+        jPanel.add(sslPane, BorderLayout.NORTH);
         jPanel.add(contextPane, BorderLayout.CENTER);
         this.add(jPanel);
+        BidiUtils.applyOrientationByLocale(this);
         usingSsl.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {