diff --git a/viewer/components/Inputs.jsx b/viewer/components/Inputs.jsx
index e9090823a..bf1fecc2f 100644
--- a/viewer/components/Inputs.jsx
+++ b/viewer/components/Inputs.jsx
@@ -57,7 +57,7 @@ export const Input=(props)=>{
         valueMissing(props.mandatory,props.value)?"missing":undefined);
     return <div className={className} >
         <span className="inputLabel">{props.label}</span>
-        <input size={size} type={props.type||"text"} value={props.value} min={props.min} max={props.max} step={props.step} onChange={
+        <input size={size} type={props.type||"text"} value={props.value} min={props.min} max={props.max} step={props.step} autoFocus={props.autoFocus} onChange={
             (ev)=>{ev.stopPropagation();props.onChange(ev.target.value);}
             }/>
         {props.children}
diff --git a/viewer/components/ItemNameDialog.jsx b/viewer/components/ItemNameDialog.jsx
index 5fd69c5be..b2c23f7bd 100644
--- a/viewer/components/ItemNameDialog.jsx
+++ b/viewer/components/ItemNameDialog.jsx
@@ -158,6 +158,7 @@ export const ItemNameDialog = ({iname, resolveFunction, fixedExt, fixedPrefix,ti
             className={error?'error':undefined}
             mandatory={mandatoryFunction}
             label={fixedPrefix?fixedPrefix:''}
+            autoFocus={true}
         >
             {fixedSuffix && <span className={"ext"}>.{fixedSuffix}</span>}
         </Input>