diff --git a/terminatorlib/terminal.py b/terminatorlib/terminal.py
index 0ee7c21b..f37973e2 100755
--- a/terminatorlib/terminal.py
+++ b/terminatorlib/terminal.py
@@ -339,6 +339,10 @@ class Terminal(gtk.VBox):
         self.vte.match_remove(self.matches[name])
         del(self.matches[name])
 
+    def maybe_copy_clipboard(self):
+        if self.config['copy_on_selection']:
+            self.vte.copy_clipboard()
+
     def connect_signals(self):
         """Connect all the gtk signals and drag-n-drop mechanics"""
 
@@ -375,10 +379,8 @@ class Terminal(gtk.VBox):
         self.vte.connect('drag-data-received',
             self.on_drag_data_received, self)
 
-        # FIXME: Shouldn't this be in configure()?
-        if self.config['copy_on_selection']:
-            self.cnxids.new(self.vte, 'selection-changed', 
-                    lambda widget: self.vte.copy_clipboard())
+        self.cnxids.new(self.vte, 'selection-changed', 
+            lambda widget: self.maybe_copy_clipboard())
 
         if self.composite_support:
             self.vte.connect('composited-changed', self.reconfigure)