diff --git a/packages/extension-ui/src/Popup/Derive/DerivationPath.tsx b/packages/extension-ui/src/Popup/Derive/DerivationPath.tsx
index 4838d56b..14e9413d 100644
--- a/packages/extension-ui/src/Popup/Derive/DerivationPath.tsx
+++ b/packages/extension-ui/src/Popup/Derive/DerivationPath.tsx
@@ -5,7 +5,7 @@ import type { ThemeProps } from '../../types';
 
 import { faLock, faLockOpen } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import styled from 'styled-components';
 
 import { Button, InputWithLabel } from '../../components';
@@ -26,6 +26,10 @@ function DerivationPath ({ className, defaultPath, isError, onChange, withSoftPa
   const [path, setPath] = useState<string>(defaultPath);
   const [isDisabled, setIsDisabled] = useState(true);
 
+  useEffect(() => {
+    setPath(defaultPath);
+  }, [defaultPath]);
+
   const _onExpand = useCallback(() => setIsDisabled(!isDisabled), [isDisabled]);
 
   const _onChange = useCallback((newPath: string): void => {
diff --git a/packages/extension-ui/src/Popup/Derive/SelectParent.tsx b/packages/extension-ui/src/Popup/Derive/SelectParent.tsx
index a198a221..5af6a011 100644
--- a/packages/extension-ui/src/Popup/Derive/SelectParent.tsx
+++ b/packages/extension-ui/src/Popup/Derive/SelectParent.tsx
@@ -40,6 +40,11 @@ export default function SelectParent ({ className, isLocked, onDerivationConfirm
     return parent?.type === 'sr25519';
   }, [accounts, parentAddress]);
 
+  // reset the password field if the parent address changes
+  useEffect(() => {
+    setParentPassword('');
+  }, [parentAddress]);
+
   useEffect(() => {
     // forbid the use of password since Keyring ignores it
     if (suriPath?.includes('///')) {