diff --git a/misc.c b/misc.c
index 7b94a7d..6589b7c 100644
--- a/misc.c
+++ b/misc.c
@@ -704,6 +704,6 @@ ImportConfigFile(const TCHAR* source)
     }
 
     ShowTrayBalloon(LoadLocalizedString(IDS_NFO_IMPORT_SUCCESS), fileName);
-    /* rescan file list after import */
-    BuildFileList();
+    /* destroy popup menus, based on existing num_configs, rescan file list and recreate menus */
+    RecreatePopupMenus();
 }
diff --git a/tray.c b/tray.c
index f512c2b..bda59ec 100644
--- a/tray.c
+++ b/tray.c
@@ -332,7 +332,7 @@ DestroyPopupMenus()
 }
 
 /* Rescan config folders and recreate popup menus */
-static void
+void
 RecreatePopupMenus(void)
 {
     DestroyPopupMenus();
diff --git a/tray.h b/tray.h
index fbd465f..7ab9dab 100644
--- a/tray.h
+++ b/tray.h
@@ -45,6 +45,7 @@
 #define IDM_CLEARPASSMENU       (1 + IDM_PASSPHRASEMENU)
 #define IDM_RECONNECTMENU       (1 + IDM_CLEARPASSMENU)
 
+void RecreatePopupMenus(void);
 void CreatePopupMenus();
 void OnNotifyTray(LPARAM);
 void OnDestroyTray(void);