diff --git a/client/js/autocompletion.js b/client/js/autocompletion.js
index 46474348..0489cc8e 100644
--- a/client/js/autocompletion.js
+++ b/client/js/autocompletion.js
@@ -17,7 +17,7 @@ module.exports = {
 	disable() {
 		if (enabled) {
 			input.off("input.tabcomplete");
-			Mousetrap(input.get(0)).off("tab", "keydown");
+			Mousetrap(input.get(0)).unbind("tab", "keydown");
 			textcomplete.destroy();
 			enabled = false;
 		}
@@ -318,7 +318,7 @@ function completeChans(word) {
 		.each(function() {
 			const self = $(this);
 
-			if (!self.hasClass("lobby")) {
+			if (self.hasClass("channel")) {
 				words.push(self.attr("aria-label"));
 			}
 		});