diff --git a/packages/neuron-ui/src/components/ImportKeystore/index.tsx b/packages/neuron-ui/src/components/ImportKeystore/index.tsx
index 2eb1fbf04e..8361bb9ff4 100644
--- a/packages/neuron-ui/src/components/ImportKeystore/index.tsx
+++ b/packages/neuron-ui/src/components/ImportKeystore/index.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useCallback, useMemo } from 'react'
+import React, { useState, useCallback, useMemo, useEffect } from 'react'
 import { RouteComponentProps } from 'react-router-dom'
 import { Stack, DefaultButton, PrimaryButton, TextField } from 'office-ui-fabric-react'
 import { useTranslation } from 'react-i18next'
@@ -6,6 +6,7 @@ import { showOpenDialog } from 'services/remote'
 import { importWalletWithKeystore } from 'states/stateProvider/actionCreators'
 import { StateWithDispatch } from 'states/stateProvider/reducer'
 import { useGoBack } from 'utils/hooks'
+import generateWalletName from 'utils/generateWalletName'
 
 const defaultFields = {
   path: '',
@@ -23,6 +24,16 @@ const ImportKeystore = (props: React.PropsWithoutRef<StateWithDispatch & RouteCo
   const [fields, setFields] = useState(defaultFields)
   const goBack = useGoBack(history)
 
+  useEffect(() => {
+    if (fields.name === '') {
+      const name = generateWalletName(wallets, wallets.length + 1, t)
+      setFields({
+        ...fields,
+        name,
+      })
+    }
+  }, [wallets, fields, setFields, t])
+
   const exsitingNames = useMemo(() => {
     return wallets.map(w => w.name)
   }, [wallets])
@@ -39,11 +50,9 @@ const ImportKeystore = (props: React.PropsWithoutRef<StateWithDispatch & RouteCo
           return
         }
         const filePath = filePaths[0]
-        const filename = filePath.split('/').pop() || 'Imported wallet'
         setFields({
           ...fields,
           path: filePath,
-          name: filename,
         })
       },
     })
diff --git a/packages/neuron-ui/src/components/WalletWizard/index.tsx b/packages/neuron-ui/src/components/WalletWizard/index.tsx
index 3ec3a37f06..e8119349b5 100644
--- a/packages/neuron-ui/src/components/WalletWizard/index.tsx
+++ b/packages/neuron-ui/src/components/WalletWizard/index.tsx
@@ -19,6 +19,7 @@ import { createWalletWithMnemonic, importWalletWithMnemonic } from 'states/state
 import { Routes, MnemonicAction } from 'utils/const'
 import { buttonGrommetIconStyles } from 'utils/icons'
 import { verifyPasswordComplexity } from 'utils/validators'
+import generateWalletName from 'utils/generateWalletName'
 
 export enum WalletWizardPath {
   Welcome = '/welcome',
@@ -212,16 +213,9 @@ const Submission = ({
   const message = 'wizard.set-wallet-name-and-password'
 
   useEffect(() => {
-    const genName = (baseNum: number = 0): string => {
-      const walletName = t('wizard.wallet-suffix', { suffix: baseNum })
-      if (wallets.some(wallet => wallet.name === walletName)) {
-        return genName(baseNum + 1)
-      }
-      return walletName
-    }
     dispatch({
       type: 'name',
-      payload: genName(wallets.length + 1),
+      payload: generateWalletName(wallets, wallets.length + 1, t),
     })
     dispatch({
       type: 'password',
diff --git a/packages/neuron-ui/src/utils/generateWalletName.ts b/packages/neuron-ui/src/utils/generateWalletName.ts
new file mode 100644
index 0000000000..f21cc582f2
--- /dev/null
+++ b/packages/neuron-ui/src/utils/generateWalletName.ts
@@ -0,0 +1,8 @@
+const generateWalletName = (wallets: State.WalletIdentity[], baseNum: number = 0, t: any): string => {
+  const walletName = t('wizard.wallet-suffix', { suffix: baseNum })
+  if (wallets.some(wallet => wallet.name === walletName)) {
+    return generateWalletName(wallets, baseNum + 1, t)
+  }
+  return walletName
+}
+export default generateWalletName