diff --git a/src/ui/components/password/PasswordTextarea.tsx b/src/ui/components/password/PasswordTextarea.tsx
index 24fcfeecb..8f575885a 100644
--- a/src/ui/components/password/PasswordTextarea.tsx
+++ b/src/ui/components/password/PasswordTextarea.tsx
@@ -61,11 +61,13 @@ const PasswordTextarea = ({
     // The actual textarea styling
     '& .MuiInputBase-input': {
       padding: '20px',
+      paddingRight: '40px',
       resize: 'none',
       fontSize: '16px',
       fontFamily: 'Inter',
       fontWeight: 400,
       color: '#fff',
+
       WebkitTextSecurity: showPassword ? 'none' : 'disc',
       '&::placeholder': {
         color: '#767676',
diff --git a/src/ui/views/Welcome/import-profile/index.tsx b/src/ui/views/Welcome/import-profile/index.tsx
index e808e9382..75e9d87e9 100644
--- a/src/ui/views/Welcome/import-profile/index.tsx
+++ b/src/ui/views/Welcome/import-profile/index.tsx
@@ -1,6 +1,6 @@
 import { Alert, Snackbar } from '@mui/material';
 import React, { useEffect, useReducer } from 'react';
-import { useNavigate } from 'react-router';
+import { useLocation, useNavigate } from 'react-router';
 
 import {
   IMPORT_STEPS,
@@ -27,6 +27,7 @@ export const initImportProfileState = (initialState: ImportState): ImportState =
 
 const ImportProfile = () => {
   const navigate = useNavigate();
+  const location = useLocation();
   const usewallet = useWallet();
 
   const [state, dispatch] = useReducer(importProfileReducer, INITIAL_IMPORT_STATE);
@@ -107,8 +108,14 @@ const ImportProfile = () => {
   };
 
   const goBack = () => {
-    if (activeTab === IMPORT_STEPS.GOOGLE_BACKUP || activeTab === IMPORT_STEPS.ALL_SET) {
-      navigate(-1);
+    if (
+      activeTab === IMPORT_STEPS.GOOGLE_BACKUP ||
+      activeTab === IMPORT_STEPS.ALL_SET ||
+      activeTab === IMPORT_STEPS.IMPORT
+    ) {
+      if (location.key !== 'default') {
+        navigate(-1);
+      }
       return;
     }
     dispatch({ type: 'GO_BACK' });
@@ -131,11 +138,15 @@ const ImportProfile = () => {
       />
     );
   }
+
+  const showBackButton =
+    activeTab !== IMPORT_STEPS.ALL_SET &&
+    (activeTab !== IMPORT_STEPS.IMPORT || location.key !== 'default');
   return (
     <LandingComponents
       activeIndex={Object.values(IMPORT_STEPS).indexOf(activeTab)}
       direction="right"
-      showBackButton={activeTab !== IMPORT_STEPS.ALL_SET && activeTab !== IMPORT_STEPS.IMPORT}
+      showBackButton={showBackButton}
       onBack={goBack}
       showConfetti={activeTab === IMPORT_STEPS.ALL_SET}
       showRegisterHeader={true}