=== modified file 'terminatorlib/config.py'
--- terminatorlib/config.py	2014-01-24 22:29:07 +0000
+++ terminatorlib/config.py	2014-08-24 16:31:59 +0000
@@ -176,7 +176,8 @@
             'insert_number'    : '',
             'insert_padded'    : '',
             'edit_window_title': '',
-            'layout_launcher'  : ''
+            'layout_launcher'  : '',
+            'rename_tab'       : '<Alt>t'
         },
         'profiles': {
             'default':  {

=== modified file 'terminatorlib/editablelabel.py'
--- terminatorlib/editablelabel.py	2013-01-30 11:27:01 +0000
+++ terminatorlib/editablelabel.py	2014-08-24 17:45:18 +0000
@@ -69,28 +69,31 @@
         """get the text from the label"""
         return(self._label.get_text())
 
+    def begin_editing(self):
+        self.remove (self._label)
+        self._entry = gtk.Entry ()
+        self._entry.set_text (self._label.get_text ())
+        self._entry.show ()
+        self.add (self._entry)
+        sig = self._entry.connect ("focus-out-event", self._entry_to_label)
+        self._entry_handler_id.append(sig)
+        sig = self._entry.connect ("activate", self._on_entry_activated)
+        self._entry_handler_id.append(sig)
+        sig = self._entry.connect ("key-press-event",
+                                     self._on_entry_keypress)
+        self._entry_handler_id.append(sig)
+        sig = self._entry.connect("button-press-event",
+                                  self._on_entry_buttonpress)
+        self._entry_handler_id.append(sig)
+        self._entry.grab_focus ()
+
     def _on_click_text(self, widget, event):
         # pylint: disable-msg=W0613
         """event handling text edition"""
         if event.button != 1:
             return False
         if event.type == gtk.gdk._2BUTTON_PRESS:
-            self.remove (self._label)
-            self._entry = gtk.Entry ()
-            self._entry.set_text (self._label.get_text ())
-            self._entry.show ()
-            self.add (self._entry)
-            sig = self._entry.connect ("focus-out-event", self._entry_to_label)
-            self._entry_handler_id.append(sig)
-            sig = self._entry.connect ("activate", self._on_entry_activated)
-            self._entry_handler_id.append(sig)
-            sig = self._entry.connect ("key-press-event",
-                                         self._on_entry_keypress)
-            self._entry_handler_id.append(sig)
-            sig = self._entry.connect("button-press-event",
-                                      self._on_entry_buttonpress)
-            self._entry_handler_id.append(sig)
-            self._entry.grab_focus ()
+            self.begin_editing()
             return(True)
         return(False)
 

=== modified file 'terminatorlib/prefseditor.py'
--- terminatorlib/prefseditor.py	2014-01-24 22:29:07 +0000
+++ terminatorlib/prefseditor.py	2014-08-24 16:38:30 +0000
@@ -147,7 +147,8 @@
                         'insert_number'    : 'Insert terminal number',
                         'insert_padded'    : 'Insert zero padded terminal number',
                         'edit_window_title': 'Edit window title',
-                        'layout_launcher'  : 'Open layout launcher window'
+                        'layout_launcher'  : 'Open layout launcher window',
+                        'rename_tab'       : 'Edit current tab title'
             }
 
     def __init__ (self, term):

=== modified file 'terminatorlib/window.py'
--- terminatorlib/window.py	2014-01-24 22:29:54 +0000
+++ terminatorlib/window.py	2014-08-24 17:24:45 +0000
@@ -218,6 +218,11 @@
                             gtk.gdk.Event(gtk.gdk.DESTROY))
             elif mapping == 'new_tab':
                 self.tab_new(self.get_focussed_terminal())
+            elif mapping == 'rename_tab':
+                if self.is_child_notebook():
+                    notebook = self.get_child()
+                    page = notebook.get_nth_page(notebook.get_current_page())
+                    notebook.get_tab_label(page).label.begin_editing()
             else:
                 return(False)
             return(True)