diff --git a/TODO.mkdn b/TODO.mkdn
index 54219d8..744913d 100644
--- a/TODO.mkdn
+++ b/TODO.mkdn
@@ -18,7 +18,6 @@ Bugs
 * Windows doesn't show style sheet sometimes?? Maybe related to themes.
 * Issues with connecting? Client not closing connection right? People keep getting "nick taken" messages
 * Windows XP SP2: sometimes mouse clicks dont register? must be some kinda crash
-* Leave memos on reconnect, needs to auto-rejoin memos
 * When using mood sort, scroll position jumps to last selected chum
 
 Mac Bugs
diff --git a/pesterchum.py b/pesterchum.py
index b337b5e..3ba4619 100644
--- a/pesterchum.py
+++ b/pesterchum.py
@@ -2741,6 +2741,12 @@ class MainProgram(QtCore.QObject):
             if status == QtGui.QDialog.Rejected:
                 sys.exit(0)
             else:
+                if self.widget.tabmemo:
+                    for c in self.widget.tabmemo.convos:
+                        self.irc.joinChannel(c)
+                else:
+                    for c in self.widget.memos.values():
+                        self.irc.joinChannel(c.channel)
                 return True
 
     @QtCore.pyqtSlot()