diff --git a/hrafn.py b/hrafn.py
index 415796d..337b099 100755
--- a/hrafn.py
+++ b/hrafn.py
@@ -355,8 +355,8 @@ class Hrafn():
 
             self.lists_cond.release()
                 
-            new_pane.connect('at-clicked', self.on_at_button_clicked)
-            new_pane.connect('follow-clicked', self.on_follow_button_clicked)
+            new_pane.user_box.connect('at-clicked', self.on_at_button_clicked)
+            new_pane.user_box.connect('follow-clicked', self.on_follow_button_clicked)
             apithreads.GetFollowing(api=self.api, pane=new_pane, user=name).start()
             apithreads.GetUserInfo(api=self.api, pane=new_pane, user=name).start()
 
diff --git a/twitterwidgets.py b/twitterwidgets.py
index 8033948..d5bd9a0 100644
--- a/twitterwidgets.py
+++ b/twitterwidgets.py
@@ -59,8 +59,6 @@ class TweetPane(gtk.ScrolledWindow):
 
         if self.is_user:
             self.user_box = UserBox()
-            self.user_box.connect('at-clicked', self.on_at_clicked)
-            self.user_box.connect('follow-clicked', self.on_follow_clicked)
             tweet_box.pack_start(self.user_box)
 
         tweet_box.pack_start(self.message)
@@ -218,14 +216,6 @@ class TweetPane(gtk.ScrolledWindow):
         return self.is_user
 
 
-    def on_at_clicked(self, widget, data):
-        self.emit('at-clicked', data)
-
-
-    def on_follow_clicked(self, widget, data):
-        self.emit('follow-clicked', data)
-
-
     def set_lists(self, lists):
         if not self.is_user:
             return
@@ -254,12 +244,6 @@ gobject.signal_new("show-user", TweetPane,
 gobject.signal_new("show-hashtag", TweetPane,
                    gobject.SIGNAL_RUN_LAST,
                    gobject.TYPE_NONE, (gobject.TYPE_PYOBJECT,))
-gobject.signal_new("follow-clicked", TweetPane,
-                   gobject.SIGNAL_RUN_LAST,
-                   gobject.TYPE_NONE, (gobject.TYPE_PYOBJECT,))
-gobject.signal_new("at-clicked", TweetPane,
-                   gobject.SIGNAL_RUN_LAST,
-                   gobject.TYPE_NONE, (gobject.TYPE_PYOBJECT,))
 gobject.signal_new("new-tweets", TweetPane,
                    gobject.SIGNAL_RUN_LAST,
                    gobject.TYPE_NONE, ())