diff --git a/designer-base/src/main/java/com/fr/design/gui/ifilechooser/SwingFileChooser.java b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/SwingFileChooser.java
index 942c3430c1..47abaa8b67 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ifilechooser/SwingFileChooser.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/SwingFileChooser.java
@@ -32,7 +32,11 @@ class SwingFileChooser implements FileChooserProvider {
 
     @Override
     public File[] getSelectedFiles() {
-        return fileChooser.getSelectedFiles();
+        if (ArrayUtils.isNotEmpty(fileChooser.getSelectedFiles())) {
+            return fileChooser.getSelectedFiles();
+        } else {
+            return new File[]{fileChooser.getSelectedFile()};
+        }
     }
 
     @Override
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java
index 9d1cee8941..13857c5968 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java
@@ -34,6 +34,7 @@ import java.util.List;
  * Time: 下午8:18
  */
 public class FormWidgetDetailPane extends FormDockView{
+    private static final int LOCAL_TAB = 0;
     private static final int ONLINE_TAB = 1;
 
     private JPanel centerPane;
@@ -106,11 +107,15 @@ public class FormWidgetDetailPane extends FormDockView{
                 cardLayout.show(centerPane, paneList.get(newSelectedIndex).getTitle());
             }
         };
-        headGroup.setSelectedIndex(ComponentReuseNotificationInfo.getInstance().isClickedWidgetLib() ? 0 : ONLINE_TAB);
+        headGroup.setSelectedIndex(isNeedSwitchToOnlineTab() ? ONLINE_TAB : LOCAL_TAB);
         this.add(headGroup, BorderLayout.NORTH);
         this.add(centerPane, BorderLayout.CENTER);
     }
 
+    private boolean isNeedSwitchToOnlineTab() {
+        return !ComponentReuseNotificationInfo.getInstance().isClickedWidgetLib() && isShowOnlineWidgetRepoPane();
+    }
+
     public void resetEmptyPane(){
         this.isEmptyPane = false;
     }