diff --git a/modules/q.cpp b/modules/q.cpp
index 9b6a6acf..a4e70956 100644
--- a/modules/q.cpp
+++ b/modules/q.cpp
@@ -257,6 +257,11 @@ public:
 		if (sLine.Token(1) == "396" && sLine.Token(3).find("users.quakenet.org") != CString::npos) {
 			m_bCloaked = true;
 			PutModule("Cloak successful: Your hostname is now cloaked.");
+
+			// Join channels immediately after our spoof is set.
+			if (m_bJoinAfterCloaked) {
+				m_pNetwork->JoinChans();
+			}
 		}
 		return CONTINUE;
 	}