diff --git a/src/elements/netspeak-search-bar.tsx b/src/elements/netspeak-search-bar.tsx
index 7d3f019..8b959fb 100644
--- a/src/elements/netspeak-search-bar.tsx
+++ b/src/elements/netspeak-search-bar.tsx
@@ -6,6 +6,8 @@ import { delay } from "../lib/util";
 interface Props {
 	query: string;
 	onQueryEnter: (query: string) => void;
+
+	autoFocus?: boolean;
 }
 interface State {
 	original: string;
@@ -70,6 +72,7 @@ export class NetspeakSearchBar extends React.PureComponent<Props, State> {
 				type="text"
 				className="NetspeakSearchBar"
 				value={this.state.value}
+				autoFocus={this.props.autoFocus}
 				onChange={this._onChangeHandler}
 				onKeyUp={this._oKeyupHandler}
 			/>
diff --git a/src/elements/netspeak-search.tsx b/src/elements/netspeak-search.tsx
index 8df08db..26ca489 100644
--- a/src/elements/netspeak-search.tsx
+++ b/src/elements/netspeak-search.tsx
@@ -49,6 +49,8 @@ interface Props extends LocalizableProps {
 	onSetExampleVisibility?: (value: ExampleVisibility) => void;
 
 	pageSize?: number;
+
+	autoFocus?: boolean;
 }
 interface State {
 	query: string;
@@ -417,6 +419,7 @@ export class NetspeakSearch extends React.PureComponent<Props, State> {
 									<NetspeakSearchBar
 										query={this.state.query}
 										onQueryEnter={this._onSearchBarQueryEnterHandler}
+										autoFocus={this.props.autoFocus}
 									/>
 								</td>
 								<td>
diff --git a/src/page-elements/search-page.tsx b/src/page-elements/search-page.tsx
index 494bb65..b839427 100644
--- a/src/page-elements/search-page.tsx
+++ b/src/page-elements/search-page.tsx
@@ -118,6 +118,7 @@ export default class SearchPage extends React.PureComponent<unknown, State> {
 						defaultExampleVisibility={this.state.exampleVisibility}
 						onSetExampleVisibility={this._onSetExampleVisibilityHandler}
 						pageSize={40}
+						autoFocus={true}
 					/>
 				</div>
 			</Page>