diff --git a/src/renderer/components/header/lock/HeaderLock.tsx b/src/renderer/components/header/lock/HeaderLock.tsx
index 81ab351eb..d937e13b6 100644
--- a/src/renderer/components/header/lock/HeaderLock.tsx
+++ b/src/renderer/components/header/lock/HeaderLock.tsx
@@ -44,7 +44,7 @@ export const HeaderLock: React.FC<Props> = (props): JSX.Element => {
                   text-text2 dark:bg-gray0d
                   dark:text-text2d
                   ">
-                {truncateMiddle(name, { start: 4, end: 4, max: 16 })}
+                {truncateMiddle(name, { start: 3, end: 3, max: 11 })}
               </p>
             )
           )
diff --git a/src/renderer/components/settings/WalletSettings.tsx b/src/renderer/components/settings/WalletSettings.tsx
index ab2d38127..2417d4cf5 100644
--- a/src/renderer/components/settings/WalletSettings.tsx
+++ b/src/renderer/components/settings/WalletSettings.tsx
@@ -60,7 +60,9 @@ import {
   WalletAddressAsync,
   KeystoreUnlocked,
   ChangeKeystoreWalletHandler,
-  ChangeKeystoreWalletRD
+  ChangeKeystoreWalletRD,
+  RenameKeystoreWalletHandler,
+  RenameKeystoreWalletRD
 } from '../../services/wallet/types'
 import { walletTypeToI18n } from '../../services/wallet/util'
 import { AttentionIcon } from '../icons'
@@ -77,8 +79,9 @@ type Props = {
   network: Network
   walletAccounts: O.Option<WalletAccounts>
   lockWallet: FP.Lazy<void>
-  removeKeystore: RemoveKeystoreWalletHandler
-  changeKeystore$: ChangeKeystoreWalletHandler
+  removeKeystoreWallet: RemoveKeystoreWalletHandler
+  changeKeystoreWallet$: ChangeKeystoreWalletHandler
+  renameKeystoreWallet$: RenameKeystoreWalletHandler
   exportKeystore: () => Promise<void>
   addLedgerAddress: (chain: Chain, walletIndex: number) => void
   verifyLedgerAddress: (chain: Chain, walletIndex: number) => Promise<boolean>
@@ -100,13 +103,14 @@ export const WalletSettings: React.FC<Props> = (props): JSX.Element => {
     network,
     walletAccounts: oWalletAccounts,
     lockWallet,
-    removeKeystore,
-    changeKeystore$,
+    removeKeystoreWallet,
+    changeKeystoreWallet$,
+    renameKeystoreWallet$,
     exportKeystore,
     addLedgerAddress,
     verifyLedgerAddress,
     removeLedgerAddress,
-    keystore: { phrase, name: walletName },
+    keystore: { phrase, name: walletName, id: walletId },
     wallets,
     clickAddressLinkHandler,
     validatePassword$,
@@ -125,7 +129,7 @@ export const WalletSettings: React.FC<Props> = (props): JSX.Element => {
   const closeQrModal = useCallback(() => setShowQRModal(O.none), [setShowQRModal])
 
   const removeWalletHandler = useCallback(async () => {
-    const noWallets = await removeKeystore()
+    const noWallets = await removeKeystoreWallet()
     if (noWallets >= 1) {
       // goto unlock screen to unlock another wallet
       navigate(walletRoutes.locked.path())
@@ -133,7 +137,7 @@ export const WalletSettings: React.FC<Props> = (props): JSX.Element => {
       // no wallet -> go to homepage
       navigate(appRoutes.base.template)
     }
-  }, [removeKeystore, navigate])
+  }, [removeKeystoreWallet, navigate])
 
   const onSuccessPassword = useCallback(() => {
     setShowPasswordModal(false)
@@ -448,11 +452,11 @@ export const WalletSettings: React.FC<Props> = (props): JSX.Element => {
 
   const changeWalletHandler = useCallback(
     (id: KeystoreId) => {
-      subscribeChangeWalletState(changeKeystore$(id))
+      subscribeChangeWalletState(changeKeystoreWallet$(id))
       // Jump to `UnlockView` to avoid staying at wallet settings
       navigate(walletRoutes.locked.path())
     },
-    [changeKeystore$, navigate, subscribeChangeWalletState]
+    [changeKeystoreWallet$, navigate, subscribeChangeWalletState]
   )
 
   const renderChangeWalletError = useMemo(
@@ -474,9 +478,33 @@ export const WalletSettings: React.FC<Props> = (props): JSX.Element => {
     [changeWalletState, intl]
   )
 
-  const changeWalletNameHandler = useCallback((walletName: string) => {
-    console.log('walletName:', walletName)
-  }, [])
+  const { state: renameWalletState, subscribe: subscribeRenameWalletState } =
+    useSubscriptionState<RenameKeystoreWalletRD>(RD.initial)
+
+  const changeWalletNameHandler = useCallback(
+    (walletName: string) => {
+      subscribeRenameWalletState(renameKeystoreWallet$(walletId, walletName))
+    },
+    [renameKeystoreWallet$, subscribeRenameWalletState, walletId]
+  )
+
+  const renderRenameWalletError = useMemo(
+    () =>
+      FP.pipe(
+        renameWalletState,
+        RD.fold(
+          () => <></>,
+          () => <></>,
+          (error) => (
+            <p className="text-center font-main text-[14px] uppercase text-error0">
+              {intl.formatMessage({ id: 'wallet.name.error.rename' })} {error?.message ?? error.toString()}
+            </p>
+          ),
+          () => <></>
+        )
+      ),
+    [intl, renameWalletState]
+  )
 
   return (
     <div className="mt-40px bg-bg0 py-10px px-40px dark:bg-bg0d">
@@ -518,8 +546,13 @@ export const WalletSettings: React.FC<Props> = (props): JSX.Element => {
             <h1 className="p-20px font-main text-18 uppercase text-text0 dark:text-text0d">
               {intl.formatMessage({ id: 'setting.wallet.management' })}
             </h1>
-            <EditableWalletName className="mb-30px" name={walletName} onChange={changeWalletNameHandler} />
-            <div className="flex flex-col items-center md:flex-row">
+            <EditableWalletName
+              name={walletName}
+              onChange={changeWalletNameHandler}
+              loading={RD.isPending(renameWalletState)}
+            />
+            {renderRenameWalletError}
+            <div className="mt-30px flex flex-col items-center md:flex-row">
               <div className="flex w-full justify-center md:w-1/2">
                 <TextButton
                   className="m-0 min-w-[200px] md:m-20px"
diff --git a/src/renderer/components/uielements/wallet/EditableWalletName.tsx b/src/renderer/components/uielements/wallet/EditableWalletName.tsx
index 8ac666a1e..cebfb47e7 100644
--- a/src/renderer/components/uielements/wallet/EditableWalletName.tsx
+++ b/src/renderer/components/uielements/wallet/EditableWalletName.tsx
@@ -7,11 +7,13 @@ import { useForm } from 'react-hook-form'
 import { useIntl } from 'react-intl'
 
 import { MAX_WALLET_NAME_CHARS } from '../../../services/wallet/const'
-import { BaseButton } from '../button'
+// import { LoadingIcon } from '../../icons'
+import { BaseButton, TextButton } from '../button'
 import { Input } from '../input/Input'
 
 export type Props = {
   name: string
+  loading?: boolean
   onChange: (name: string) => void
   className?: string
 }
@@ -21,9 +23,10 @@ type FormData = {
 }
 
 export const EditableWalletName: React.FC<Props> = (props): JSX.Element => {
-  const { name, onChange, className = '' } = props
+  const { name: initialName, onChange, loading = false, className = '' } = props
 
   const [editableName, setEditableName] = useState<O.Option<string>>(O.none)
+  const [name, setName] = useState<string>(initialName)
 
   const intl = useIntl()
 
@@ -39,18 +42,22 @@ export const EditableWalletName: React.FC<Props> = (props): JSX.Element => {
       setEditableName(O.some(name))
     }
     return (
-      <div
-        className={`flex cursor-pointer items-center font-main text-[18px] text-text0 dark:text-text0d`}
+      <TextButton
+        color="neutral"
+        uppercase={false}
+        disabled={loading}
+        size="large"
+        loading={loading}
+        className={`flex ${loading ? 'cursor-not-allowed' : 'cursor-pointer'} items-center text-[18px]`}
         onClick={edit}>
         {name}
         <PencilAltIcon className="dark:text0d ml-[5px] h-[20px] w-[20px] text-turquoise" />
-      </div>
+      </TextButton>
     )
-  }, [name])
+  }, [loading, name])
 
   const renderEditableName = useCallback(
     (name: string) => {
-      const confirm = () => FP.pipe(editableName, O.fold(FP.constVoid, onChange))
       const cancel = () => {
         reset()
         setEditableName(O.none)
@@ -58,25 +65,22 @@ export const EditableWalletName: React.FC<Props> = (props): JSX.Element => {
       const submit = ({ name }: FormData) => {
         setEditableName(O.none)
         onChange(name)
+        setName(name)
         reset()
       }
 
       const keyDownHandler = (e: React.KeyboardEvent<HTMLElement>) => {
-        console.log('key down', e.key)
         if (e.key === 'Escape') {
           cancel()
         }
       }
 
-      const error = !!errors.name
-
       return (
         <form className="items-top flex w-full flex-col items-center" onSubmit={handleSubmit(submit)}>
           <div className="flex w-full items-center justify-center">
             <Input
-              // 60px offset of icons width to stay in center
-              className={`${error ? 'ring-error0' : 'dark:gray1d ring-gray1'} w-full max-w-[380px] text-[18px]
-              `}
+              id="name"
+              className="w-full max-w-[380px]"
               size="large"
               defaultValue={name}
               autoFocus
@@ -86,8 +90,8 @@ export const EditableWalletName: React.FC<Props> = (props): JSX.Element => {
               error={!!errors.name}
               onKeyDown={keyDownHandler}
             />
-            <BaseButton className="ml-[5px] h-[24px] w-[24px] !p-0 text-turquoise" onClick={confirm} type="submit">
-              <CheckCircleIcon className="" />
+            <BaseButton className="!p-0 text-turquoise" onClick={handleSubmit(submit)} type="submit">
+              <CheckCircleIcon className="ml-[5px] h-[24px] w-[24px]" />
             </BaseButton>
             <XCircleIcon className="ml-[5px] h-[24px] w-[24px] cursor-pointer text-error0" onClick={cancel} />
           </div>
@@ -99,13 +103,14 @@ export const EditableWalletName: React.FC<Props> = (props): JSX.Element => {
         </form>
       )
     },
-    [editableName, errors.name, handleSubmit, intl, onChange, register, reset]
+    [errors.name, handleSubmit, intl, onChange, register, reset]
   )
 
   return (
     <div className={`flex w-full flex-col items-center justify-center ${className}`}>
       <h2 className="w-full text-center font-main text-[12px] uppercase text-text2 dark:text-text2d">
-        {intl.formatMessage({ id: 'wallet.name' })}{' '}
+        {intl.formatMessage({ id: 'wallet.name' })}
+        {/* show info about max. chars in editable mode only  */}
         {FP.pipe(
           editableName,
           O.fold(
@@ -118,7 +123,12 @@ export const EditableWalletName: React.FC<Props> = (props): JSX.Element => {
           )
         )}
       </h2>
-      {FP.pipe(editableName, O.fold(renderName, renderEditableName))}
+      <div
+        className={`flex items-center ${loading ? 'opacity-65' : 'opacity-100'} ${
+          O.isSome(editableName) ? 'w-full' : ''
+        }`}>
+        {FP.pipe(editableName, O.fold(renderName, renderEditableName))}
+      </div>
     </div>
   )
 }
diff --git a/src/renderer/hooks/useKeystoreState.ts b/src/renderer/hooks/useKeystoreState.ts
index c978d6a84..3dd903f7b 100644
--- a/src/renderer/hooks/useKeystoreState.ts
+++ b/src/renderer/hooks/useKeystoreState.ts
@@ -9,7 +9,8 @@ import {
   KeystoreState,
   Phrase,
   RemoveKeystoreWalletHandler,
-  ChangeKeystoreWalletHandler
+  ChangeKeystoreWalletHandler,
+  RenameKeystoreWalletHandler
 } from '../services/wallet/types'
 import { getPhrase, getWalletName, isLocked } from '../services/wallet/util'
 
@@ -19,12 +20,20 @@ export const useKeystoreState = (): {
   walletName: O.Option<string>
   remove: RemoveKeystoreWalletHandler
   change$: ChangeKeystoreWalletHandler
+  rename$: RenameKeystoreWalletHandler
   unlock: (password: string) => Promise<void>
   lock: FP.Lazy<void>
   locked: boolean
 } => {
   const {
-    keystoreService: { keystore$, unlock, lock, removeKeystoreWallet: remove, changeKeystoreWallet: change$ }
+    keystoreService: {
+      keystore$,
+      unlock,
+      lock,
+      removeKeystoreWallet: remove,
+      changeKeystoreWallet: change$,
+      renameKeystoreWallet: rename$
+    }
   } = useWalletContext()
 
   const state = useObservableState(keystore$, INITIAL_KEYSTORE_STATE)
@@ -33,5 +42,5 @@ export const useKeystoreState = (): {
   const [walletName] = useObservableState(() => FP.pipe(keystore$, RxOp.map(FP.flow(getWalletName))), O.none)
   const [locked] = useObservableState(() => FP.pipe(keystore$, RxOp.map(FP.flow(isLocked))), false)
 
-  return { state, phrase, walletName, unlock, lock, locked, remove, change$ }
+  return { state, phrase, walletName, unlock, lock, locked, remove, change$, rename$ }
 }
diff --git a/src/renderer/i18n/de/wallet.ts b/src/renderer/i18n/de/wallet.ts
index c8b500e80..068ad78c2 100644
--- a/src/renderer/i18n/de/wallet.ts
+++ b/src/renderer/i18n/de/wallet.ts
@@ -4,6 +4,7 @@ const wallet: WalletMessages = {
   'wallet.name': 'Wallet Name',
   'wallet.name.maxChars': 'Max. {max} Zeichen',
   'wallet.name.error.empty': 'Bitte Namen der Wallet angeben',
+  'wallet.name.error.rename': 'Error beim Umbenennen der Wallet',
   'wallet.nav.deposits': 'Einzahlungen',
   'wallet.nav.bonds': 'Bonds',
   'wallet.nav.poolshares': 'Anteile',
diff --git a/src/renderer/i18n/en/wallet.ts b/src/renderer/i18n/en/wallet.ts
index bb495d33f..e8cee3e2e 100644
--- a/src/renderer/i18n/en/wallet.ts
+++ b/src/renderer/i18n/en/wallet.ts
@@ -4,6 +4,7 @@ const wallet: WalletMessages = {
   'wallet.name': 'Wallet name',
   'wallet.name.maxChars': 'Max. {max} chars',
   'wallet.name.error.empty': 'Please enter a name for your wallet',
+  'wallet.name.error.rename': 'Error while renaming the wallet',
   'wallet.nav.deposits': 'Deposits',
   'wallet.nav.bonds': 'Bonds',
   'wallet.nav.poolshares': 'Shares',
diff --git a/src/renderer/i18n/fr/wallet.ts b/src/renderer/i18n/fr/wallet.ts
index 80cbc5036..f54d71c40 100644
--- a/src/renderer/i18n/fr/wallet.ts
+++ b/src/renderer/i18n/fr/wallet.ts
@@ -4,6 +4,7 @@ const wallet: WalletMessages = {
   'wallet.name': 'Wallet name - FR',
   'wallet.name.maxChars': 'Max. {max} chars - FR',
   'wallet.name.error.empty': 'Please enter a name for your wallet - FR',
+  'wallet.name.error.rename': 'Error while renaming the wallet - FR',
   'wallet.nav.deposits': 'Dépots',
   'wallet.nav.bonds': 'Cautions',
   'wallet.nav.poolshares': 'Quote-part',
diff --git a/src/renderer/i18n/ru/wallet.ts b/src/renderer/i18n/ru/wallet.ts
index ca5eec4a1..cafedd8f2 100644
--- a/src/renderer/i18n/ru/wallet.ts
+++ b/src/renderer/i18n/ru/wallet.ts
@@ -4,6 +4,7 @@ const wallet: WalletMessages = {
   'wallet.name': 'Wallet name - RU',
   'wallet.name.maxChars': 'Max. {max} chars - RU',
   'wallet.name.error.empty': 'Please enter a name for your wallet - RU',
+  'wallet.name.error.rename': 'Error while renaming the wallet - RU',
   'wallet.nav.deposits': 'Вклады',
   'wallet.nav.bonds': 'Бонды',
   'wallet.nav.poolshares': 'Доли',
diff --git a/src/renderer/i18n/types.ts b/src/renderer/i18n/types.ts
index 4d5d5a977..1f6baea9b 100644
--- a/src/renderer/i18n/types.ts
+++ b/src/renderer/i18n/types.ts
@@ -152,6 +152,7 @@ type WalletMessageKey =
   | 'wallet.name'
   | 'wallet.name.maxChars'
   | 'wallet.name.error.empty'
+  | 'wallet.name.error.rename'
   | 'wallet.nav.deposits'
   | 'wallet.nav.bonds'
   | 'wallet.nav.poolshares'
diff --git a/src/renderer/services/wallet/keystore.ts b/src/renderer/services/wallet/keystore.ts
index 46807bb23..5e6a3ba42 100644
--- a/src/renderer/services/wallet/keystore.ts
+++ b/src/renderer/services/wallet/keystore.ts
@@ -23,7 +23,9 @@ import {
   AddKeystoreParams,
   KeystoreWalletsLD,
   KeystoreWalletsUI$,
-  ChangeKeystoreWalletLD
+  RenameKeystoreWalletHandler,
+  ChangeKeystoreWalletHandler,
+  isKeystoreUnlocked
 } from './types'
 import {
   getKeystore,
@@ -122,7 +124,7 @@ export const removeKeystoreWallet = async () => {
   return wallets.length
 }
 
-const changeKeystoreWallet = (keystoreId: KeystoreId): ChangeKeystoreWalletLD => {
+const changeKeystoreWallet: ChangeKeystoreWalletHandler = (keystoreId: KeystoreId) => {
   const wallets = getKeystoreWallets()
   // Get selected wallet
   const selectedWallet = FP.pipe(
@@ -136,7 +138,7 @@ const changeKeystoreWallet = (keystoreId: KeystoreId): ChangeKeystoreWalletLD =>
   const { id, name } = selectedWallet
 
   const updatedWallets = FP.pipe(
-    getKeystoreWallets(),
+    wallets,
     A.map((wallet) => ({ ...wallet, selected: id === wallet.id }))
   )
 
@@ -145,13 +147,13 @@ const changeKeystoreWallet = (keystoreId: KeystoreId): ChangeKeystoreWalletLD =>
     // encode wallets first
     ipcKeystoreWalletsIO.encode,
     // Save updated `wallets` to disk
-    (wallets) => Rx.of(window.apiKeystore.saveKeystoreWallets(wallets)),
+    (wallets) => Rx.from(window.apiKeystore.saveKeystoreWallets(wallets)),
     RxOp.catchError((err) => Rx.of(RD.failure(err))),
     RxOp.map(() => RD.success(true)),
     liveData.map((_) => {
       // Update states
       setKeystoreWallets(updatedWallets)
-      // set selected wallet
+      // set selected wallet as locked wallet
       setKeystoreState(O.some({ id, name }))
       return true
     }),
@@ -159,6 +161,43 @@ const changeKeystoreWallet = (keystoreId: KeystoreId): ChangeKeystoreWalletLD =>
   )
 }
 
+const renameKeystoreWallet: RenameKeystoreWalletHandler = (id, name) => {
+  // get keystore state - needs to be UNLOCKED
+  const updatedKeystoreState = FP.pipe(
+    getKeystoreState(),
+    O.chain(FP.flow(O.fromPredicate(isKeystoreUnlocked))),
+    // rename in state
+    O.map((state) => ({ ...state, name })),
+    O.toNullable
+  )
+
+  if (!updatedKeystoreState)
+    return Rx.of(RD.failure(Error(`Could not rename wallet with id ${id} - it seems to be locked`)))
+
+  // update selected wallet in list of wallets
+  const updatedWallets = FP.pipe(
+    getKeystoreWallets(),
+    A.map((wallet) => (id === wallet.id ? { ...wallet, name } : wallet))
+  )
+  return FP.pipe(
+    updatedWallets,
+    // encode wallets first
+    ipcKeystoreWalletsIO.encode,
+    // Save updated `wallets` to disk
+    (wallets) => Rx.from(window.apiKeystore.saveKeystoreWallets(wallets)),
+    RxOp.catchError((err) => Rx.of(RD.failure(err))),
+    RxOp.map(() => RD.success(true)),
+    liveData.map((_) => {
+      // Update states of all wallets
+      setKeystoreWallets(updatedWallets)
+      // set selected wallet - still unlocked
+      setKeystoreState(O.some(updatedKeystoreState))
+      return true
+    }),
+    RxOp.startWith(RD.pending)
+  )
+}
+
 const importKeystore = async ({ keystore, password, name, id }: ImportKeystoreParams): Promise<void> => {
   try {
     setImportingKeystoreState(RD.pending)
@@ -311,6 +350,7 @@ export const keystoreService: KeystoreService = {
   addKeystoreWallet,
   removeKeystoreWallet,
   changeKeystoreWallet,
+  renameKeystoreWallet,
   importKeystore,
   exportKeystore,
   loadKeystore$,
diff --git a/src/renderer/services/wallet/types.ts b/src/renderer/services/wallet/types.ts
index ad3307c10..3fba2d1ae 100644
--- a/src/renderer/services/wallet/types.ts
+++ b/src/renderer/services/wallet/types.ts
@@ -58,6 +58,10 @@ export type ImportingKeystoreStateLD = Rx.Observable<ImportingKeystoreStateRD>
 
 export type RemoveKeystoreWalletHandler = () => Promise<number>
 
+export type RenameKeystoreWalletRD = RD.RemoteData<Error, boolean>
+export type RenameKeystoreWalletLD = LiveData<Error, boolean>
+export type RenameKeystoreWalletHandler = (id: KeystoreId, name: string) => RenameKeystoreWalletLD
+
 export type ChangeKeystoreWalletRD = RD.RemoteData<Error, boolean>
 export type ChangeKeystoreWalletLD = LiveData<Error, boolean>
 export type ChangeKeystoreWalletHandler = (id: KeystoreId) => ChangeKeystoreWalletLD
@@ -67,6 +71,7 @@ export type KeystoreService = {
   addKeystoreWallet: (params: AddKeystoreParams) => Promise<void>
   removeKeystoreWallet: RemoveKeystoreWalletHandler
   changeKeystoreWallet: ChangeKeystoreWalletHandler
+  renameKeystoreWallet: RenameKeystoreWalletHandler
   loadKeystore$: () => LoadKeystoreLD
   importKeystore: (params: ImportKeystoreParams) => Promise<void>
   exportKeystore: () => Promise<void>
diff --git a/src/renderer/views/wallet/WalletSettingsView.tsx b/src/renderer/views/wallet/WalletSettingsView.tsx
index baf5bf2a2..4eaacd197 100644
--- a/src/renderer/views/wallet/WalletSettingsView.tsx
+++ b/src/renderer/views/wallet/WalletSettingsView.tsx
@@ -69,7 +69,7 @@ export const WalletSettingsView: React.FC = (): JSX.Element => {
     keystoreService: { exportKeystore, validatePassword$ }
   } = useWalletContext()
 
-  const { state: keystore, lock, remove, change$ } = useKeystoreState()
+  const { state: keystore, lock, remove, change$, rename$ } = useKeystoreState()
 
   const { network } = useNetwork()
 
@@ -417,8 +417,9 @@ export const WalletSettingsView: React.FC = (): JSX.Element => {
         <WalletSettings
           network={network}
           lockWallet={lock}
-          removeKeystore={remove}
-          changeKeystore$={change$}
+          removeKeystoreWallet={remove}
+          changeKeystoreWallet$={change$}
+          renameKeystoreWallet$={rename$}
           exportKeystore={exportKeystore}
           addLedgerAddress={addLedgerAddressHandler}
           verifyLedgerAddress={verifyLedgerAddressHandler}