diff --git a/terminatorlib/editablelabel.py b/terminatorlib/editablelabel.py
index 50a2666e..8928161a 100644
--- a/terminatorlib/editablelabel.py
+++ b/terminatorlib/editablelabel.py
@@ -108,7 +108,9 @@ class EditableLabel(gtk.EventBox):
             self._entry = None
             self.show_all ()
             self.emit('edit-done')
-            return(True)
+            # Returning False will ensure that focus out event will be sent to
+            # GtkEntry so it will disconnect 'state-changed' handler
+            return(False)
         return(False)
 
     def _on_entry_activated (self, widget):