diff --git a/src/app/common/common.tsx b/src/app/common/common.tsx
index 0f263a8a..3e271b57 100644
--- a/src/app/common/common.tsx
+++ b/src/app/common/common.tsx
@@ -231,6 +231,7 @@ interface ButtonProps {
     rightIcon?: React.ReactNode;
     color?: string;
     style?: React.CSSProperties;
+    autoFocus?: boolean;
 }
 
 class Button extends React.Component<ButtonProps> {
@@ -257,6 +258,7 @@ class Button extends React.Component<ButtonProps> {
                 onClick={this.handleClick}
                 disabled={disabled}
                 style={style}
+                autoFocus={this.props.autoFocus}
             >
                 {leftIcon && <span className="icon-left">{leftIcon}</span>}
                 {children}