diff --git a/client/src/js/components/MessageBox.jsx b/client/src/js/components/MessageBox.jsx
index 7bce4b92..99577be8 100644
--- a/client/src/js/components/MessageBox.jsx
+++ b/client/src/js/components/MessageBox.jsx
@@ -88,13 +88,21 @@ var MessageBox = React.createClass({
 			return <p className="message">{line}</p>;
 		});
 
-		return (
-			<div className="messagebox" style={style}>
-				<Infinite ref="list" containerHeight={this.state.height} elementHeight={24}>
-					{lines}
-				</Infinite>
-			</div>
-		);
+		if (lines.length !== 1) {
+			return (
+				<div className="messagebox" style={style}>
+					<Infinite ref="list" containerHeight={this.state.height} elementHeight={24}>
+						{lines}
+					</Infinite>
+				</div>
+			);
+		} else {
+			return (
+				<div className="messagebox" style={style}>
+					<div ref="list">{lines}</div>
+				</div>
+			);
+		}
 	}
 });
 
diff --git a/client/src/js/stores/selectedTab.js b/client/src/js/stores/selectedTab.js
index 7cc50175..f64f5b3e 100644
--- a/client/src/js/stores/selectedTab.js
+++ b/client/src/js/stores/selectedTab.js
@@ -54,7 +54,8 @@ var selectedTabStore = Reflux.createStore({
 
 	userAdded: function(user, server, channel) {
 		// Update the selected channel incase the casing is different
-		if (server === selectedTab.server &&
+		if (selectedTab.channel &&
+			server === selectedTab.server &&
 			user === serverStore.getNick(server) &&
 			channel.toLowerCase() === selectedTab.channel.toLowerCase()) {
 			selectedTab.channel = channel;