diff --git a/commands.js b/commands.js
index 7927e9c..c1498b1 100644
--- a/commands.js
+++ b/commands.js
@@ -17,7 +17,7 @@ const join = {
 		if (!channel) {
 			throw new Error("Missing channel name");
 		}
-		getActiveClient(app).send({ command: "JOIN", params: [channel] });
+		app.open(channel);
 	},
 };
 
diff --git a/components/app.js b/components/app.js
index c65b320..620f0d3 100644
--- a/components/app.js
+++ b/components/app.js
@@ -899,12 +899,13 @@ export default class App extends Component {
 		var client = this.clients.get(netID);
 
 		if (this.isChannel(target)) {
+			this.switchToChannel = target;
 			client.send({ command: "JOIN", params: [target] });
 		} else {
 			client.send({ command: "WHO", params: [target] });
+			this.createBuffer(netID, target);
+			this.switchBuffer({ network: netID, name: target });
 		}
-		this.createBuffer(netID, target);
-		this.switchBuffer({ network: netID, name: target });
 	}
 
 	close(id) {
@@ -1084,6 +1085,7 @@ export default class App extends Component {
 	handleJoinSubmit(data) {
 		var client = this.clients.get(this.state.joinDialog.network);
 
+		this.switchToChannel = data.channel;
 		client.send({ command: "JOIN", params: [data.channel] });
 
 		this.setState({ dialog: null, joinDialog: null });