diff --git a/plugins/Topic/plugin.py b/plugins/Topic/plugin.py
index 9909cd4ff..e18042c52 100644
--- a/plugins/Topic/plugin.py
+++ b/plugins/Topic/plugin.py
@@ -168,6 +168,9 @@ class Topic(callbacks.Plugin):
     def do332(self, irc, msg):
         if msg.args[1] in self.watchingFor332:
             self.watchingFor332.remove(msg.args[1])
+            # Store an undo for the topic when we join a channel.  This allows
+            # us to undo the first topic change that takes place in a channel.
+            self._addUndo(msg.args[1], [msg.args[2]])
 
     def topic(self, irc, msg, args, channel):
         """[<channel>]