diff --git a/nym-wallet/src/components/Accounts/AccountItem.tsx b/nym-wallet/src/components/Accounts/AccountItem.tsx
index 8344d355a4..c5b785319c 100644
--- a/nym-wallet/src/components/Accounts/AccountItem.tsx
+++ b/nym-wallet/src/components/Accounts/AccountItem.tsx
@@ -4,8 +4,16 @@ import { useClipboard } from 'use-clipboard-copy';
 import { AccountsContext } from 'src/context';
 import { AccountAvatar } from './AccountAvatar';
 
-export const AccountItem = ({ name, address }: { name: string; address: string }) => {
-  const { selectedAccount, handleSelectAccount, setDialogToDisplay, setAccountMnemonic } = useContext(AccountsContext);
+export const AccountItem = ({
+  name,
+  address,
+  onSelectAccount,
+}: {
+  name: string;
+  address: string;
+  onSelectAccount: () => void;
+}) => {
+  const { selectedAccount, setDialogToDisplay, setAccountMnemonic } = useContext(AccountsContext);
   const { copy, copied } = useClipboard({ copiedTimeout: 1000 });
   return (
     <ListItem
@@ -13,7 +21,7 @@ export const AccountItem = ({ name, address }: { name: string; address: string }
       disableGutters
       sx={selectedAccount?.id === name ? { bgcolor: 'rgba(33, 208, 115, 0.1)' } : {}}
     >
-      <ListItemButton disableRipple onClick={() => handleSelectAccount(name)}>
+      <ListItemButton disableRipple onClick={onSelectAccount}>
         <ListItemAvatar sx={{ minWidth: 0, mr: 2 }}>
           <AccountAvatar name={name} />
         </ListItemAvatar>
diff --git a/nym-wallet/src/components/Accounts/Accounts.tsx b/nym-wallet/src/components/Accounts/Accounts.tsx
index a59b59c95f..2cf5873e9e 100644
--- a/nym-wallet/src/components/Accounts/Accounts.tsx
+++ b/nym-wallet/src/components/Accounts/Accounts.tsx
@@ -1,9 +1,9 @@
 import React, { useContext, useState } from 'react';
 import { AccountsContext, AppContext } from 'src/context';
-import { EditAccountModal } from './EditAccountModal';
-import { AddAccountModal } from './AddAccountModal';
-import { AccountsModal } from './AccountsModal';
-import { MnemonicModal } from './MnemonicModal';
+import { EditAccountModal } from './modals/EditAccountModal';
+import { AddAccountModal } from './modals/AddAccountModal';
+import { AccountsModal } from './modals/AccountsModal';
+import { MnemonicModal } from './modals/MnemonicModal';
 import { AccountOverview } from './AccountOverview';
 import { MultiAccountHowTo } from './MultiAccountHowTo';