diff --git a/apps/browser-extension-wallet/src/views/browser-view/features/wallet-setup/components/HardwareWalletFlow.tsx b/apps/browser-extension-wallet/src/views/browser-view/features/wallet-setup/components/HardwareWalletFlow.tsx
index 558665f97..795b1a01b 100644
--- a/apps/browser-extension-wallet/src/views/browser-view/features/wallet-setup/components/HardwareWalletFlow.tsx
+++ b/apps/browser-extension-wallet/src/views/browser-view/features/wallet-setup/components/HardwareWalletFlow.tsx
@@ -307,6 +307,8 @@ export const HardwareWalletFlow = ({
   const onRetry = () => {
     setIsErrorDialogVisible(false);
     goBackToConnect();
+    // TODO: Remove this workaround with full app reload when SDK allows to connect Hardware Wallet for the 2nd time.
+    onAppReload();
   };
 
   const handleStartOver = () => {
diff --git a/packages/core/src/ui/components/WalletSetup/WalletSetupWalletNameStep.tsx b/packages/core/src/ui/components/WalletSetup/WalletSetupWalletNameStep.tsx
index 559f17276..3602d6215 100644
--- a/packages/core/src/ui/components/WalletSetup/WalletSetupWalletNameStep.tsx
+++ b/packages/core/src/ui/components/WalletSetup/WalletSetupWalletNameStep.tsx
@@ -63,6 +63,7 @@ export const WalletSetupWalletNameStep = ({
         label={translations.walletName}
         value={walletName}
         onChange={handleNameChange}
+        autoFocus
       />
       {isDirty && walletName && !isNameValid && (
         <p className={styles.formError} data-testid="wallet-setup-register-name-error">