diff --git a/TODO.mkdn b/TODO.mkdn
index c2b418a..f9435a5 100644
--- a/TODO.mkdn
+++ b/TODO.mkdn
@@ -20,7 +20,6 @@ Bugs
 * Windows XP SP2: sometimes mouse clicks dont register? must be some kinda crash
 * Leave memos on reconnect, needs to auto-rejoin memos
 * Leave memos on profile change (should just change nick)
-* Text input loses focus when scrolling/clicking on text area
 
 Mac Bugs
 --------
diff --git a/convo.py b/convo.py
index 17deb8b..b6f748b 100644
--- a/convo.py
+++ b/convo.py
@@ -317,6 +317,10 @@ class PesterText(QtGui.QTextEdit):
         self.parent().clearNewMessage()
         QtGui.QTextEdit.focusInEvent(self, event)
 
+    def keyPressEvent(self, event):
+        self.parent().textInput.keyPressEvent(event)
+        QtGui.QTextEdit.keyPressEvent(self, event)
+
     def mousePressEvent(self, event):
         url = self.anchorAt(event.pos())
         if url != "":