diff --git a/src/components/common/PasswordForm.tsx b/src/components/common/PasswordForm.tsx
index cbcceae2b..25eb2bf76 100644
--- a/src/components/common/PasswordForm.tsx
+++ b/src/components/common/PasswordForm.tsx
@@ -7,6 +7,7 @@ import { MIN_PASSWORD_LENGTH } from '../../config';
 import { IS_TOUCH_ENV, IS_SINGLE_COLUMN_LAYOUT } from '../../util/environment';
 import buildClassName from '../../util/buildClassName';
 import useLang from '../../hooks/useLang';
+import useTimeout from '../../hooks/useTimeout';
 
 import Button from '../ui/Button';
 
@@ -44,13 +45,11 @@ const PasswordForm: FC<OwnProps> = ({
   const [password, setPassword] = useState('');
   const [canSubmit, setCanSubmit] = useState(false);
 
-  useEffect(() => {
+  useTimeout(() => {
     if (!IS_TOUCH_ENV) {
-      setTimeout(() => {
-        inputRef.current!.focus();
-      }, FOCUS_DELAY_TIMEOUT_MS);
+      inputRef.current!.focus();
     }
-  }, []);
+  }, FOCUS_DELAY_TIMEOUT_MS);
 
   useEffect(() => {
     if (error) {