diff --git a/components/app.js b/components/app.js
index 65b8fc8..3c09ed9 100644
--- a/components/app.js
+++ b/components/app.js
@@ -183,7 +183,7 @@ export default class App extends Component {
 			connectParams.url = config.server.url;
 			if (Array.isArray(config.server.autojoin)) {
 				connectParams.autojoin = config.server.autojoin;
-			} else {
+			} else if (config.server.autojoin) {
 				connectParams.autojoin = [config.server.autojoin];
 			}
 		}
diff --git a/components/connect-form.js b/components/connect-form.js
index 05f8d9c..a79f26e 100644
--- a/components/connect-form.js
+++ b/components/connect-form.js
@@ -116,6 +116,17 @@ export default class ConnectForm extends Component {
 			`;
 		}
 
+		let autojoin = html`
+			<label>
+				Auto-join channels:<br/>
+				<input type="text" name="autojoin" value=${this.state.autojoin} disabled=${disabled} placeholder="Comma-separated list of channels"/>
+			</label>
+			<br/>
+		`;
+
+		// Show autojoin field in advanced options, except if it's pre-filled
+		let isAutojoinAdvanced = (this.props.params.autojoin || []).length === 0;
+
 		return html`
 			<form onChange=${this.handleChange} onSubmit=${this.handleSubmit}>
 				<h2>Connect to IRC</h2>
@@ -128,6 +139,8 @@ export default class ConnectForm extends Component {
 
 				${auth}
 
+				${!isAutojoinAdvanced ? [autojoin, html`<br/>`] : null}
+
 				<label>
 					<input type="checkbox" name="rememberMe" checked=${this.state.rememberMe} disabled=${disabled}/>
 					Remember me
@@ -159,11 +172,7 @@ export default class ConnectForm extends Component {
 					</label>
 					<br/><br/>
 
-					<label>
-						Auto-join channels:<br/>
-						<input type="text" name="autojoin" value=${this.state.autojoin} disabled=${disabled} placeholder="Comma-separated list of channels"/>
-					</label>
-					<br/>
+					${isAutojoinAdvanced ? autojoin : null}
 				</details>
 
 				<br/>