diff --git a/src/components/wizard/BackendSelectionStep.tsx b/src/components/wizard/BackendSelectionStep.tsx
index df7d0f5..af151a5 100644
--- a/src/components/wizard/BackendSelectionStep.tsx
+++ b/src/components/wizard/BackendSelectionStep.tsx
@@ -50,9 +50,14 @@ export function BackendSelectionStep() {
     dispatch({ type: 'SET_STEP', payload: 1 });
   }
 
+  function onInvalidSubmit() {
+    // Only one validatable field in this step: remote-name
+    document.getElementById('remote-name')?.scrollIntoView({ behavior: 'smooth', block: 'center' });
+  }
+
   function handleCardClick(backendType: BackendType) {
     pendingBackend.current = backendType;
-    void handleSubmit(onValidSubmit)();
+    void handleSubmit(onValidSubmit, onInvalidSubmit)();
   }
 
   return (
@@ -62,7 +67,7 @@ export function BackendSelectionStep() {
         Name your remote and pick the cloud storage provider you want to connect to.
         Your choice determines which credentials are required in the next step.
       </p>
-      <form onSubmit={handleSubmit(onValidSubmit)}>
+      <form onSubmit={handleSubmit(onValidSubmit, onInvalidSubmit)}>
         <TextFieldMD3
           id="remote-name"
           label="Remote name"
diff --git a/src/components/wizard/RemoteConfigStep.tsx b/src/components/wizard/RemoteConfigStep.tsx
index 95297b1..e4eee6c 100644
--- a/src/components/wizard/RemoteConfigStep.tsx
+++ b/src/components/wizard/RemoteConfigStep.tsx
@@ -10,7 +10,7 @@ import { BACKEND_SCHEMAS } from '../../schemas';
 import { FieldRenderer } from '../ui/FieldRenderer';
 import { AzureAuthToggle } from './AzureAuthToggle';
 import { SftpAuthToggle } from './SftpAuthToggle';
-import type { FieldError } from 'react-hook-form';
+import type { FieldError, FieldErrors } from 'react-hook-form';
 import { MD3_BTN_FILLED, MD3_BTN_OUTLINED } from '../../styles/md3-buttons';
 
 export function RemoteConfigStep() {
@@ -43,6 +43,13 @@ export function RemoteConfigStep() {
     dispatch({ type: 'SET_STEP', payload: 2 });
   };
 
+  function onInvalidSubmit(errors: FieldErrors) {
+    const firstKey = Object.keys(errors)[0];
+    if (firstKey) {
+      document.getElementById(firstKey)?.scrollIntoView({ behavior: 'smooth', block: 'center' });
+    }
+  }
+
   const backendLabel: Record<NonNullable<typeof backendType>, string> = {
     azureblob:       'Azure Blob Storage',
     s3:              'Amazon S3',
@@ -60,7 +67,7 @@ export function RemoteConfigStep() {
         Enter the credentials for your selected backend. These values are written directly into the
         generated rclone.conf and are never sent to any server.
       </p>
-      <form onSubmit={handleSubmit(onNext)}>
+      <form onSubmit={handleSubmit(onNext, onInvalidSubmit)}>
         {backendType === 'azureblob' ? (
           <>
             {/* Account field via FieldRenderer */}