diff --git a/components/app.js b/components/app.js
index 025ca7e..67db6ba 100644
--- a/components/app.js
+++ b/components/app.js
@@ -456,7 +456,9 @@ export default class App extends Component {
 			});
 		}
 
-		if (!client.isMyNick(msg.prefix.name) && (msg.command != "PART" && msg.comand != "QUIT")) {
+		// Open a new buffer if the message doesn't come from me or is a
+		// self-message
+		if ((!client.isMyNick(msg.prefix.name) || client.isMyNick(bufName)) && (msg.command != "PART" && msg.comand != "QUIT")) {
 			this.createBuffer(serverID, bufName);
 		}