diff --git a/ChangeLog b/ChangeLog
index 57e71312..6e41b1c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ terminator 0.7:
 		shortcuts. Closes LP #179310
   * Borderless support (tell your window manager not to decorate Terminator)
 	* Font zooming support. Closes LP #178792
+	* Set the VTE widget to have a tooltip of its window title. This may be
+	  reverted if it is annoying
 
 terminator 0.6:
 
diff --git a/terminator b/terminator
index bee9795e..c5125717 100755
--- a/terminator
+++ b/terminator
@@ -135,6 +135,7 @@ class TerminatorTerm:
     self._vte.connect ("key-press-event", self.on_vte_key_press)
     self._vte.connect ("button-press-event", self.on_vte_button_press)
     self._vte.connect ("popup-menu", self.on_vte_popup_menu)
+    self._vte.connect ("window-title-changed", self.on_vte_title_change)
 
     exit_action = self.gconf_client.get_string (self.profile + "/exit_action")
     if exit_action == "restart":
@@ -397,6 +398,10 @@ class TerminatorTerm:
     menu.show_all ()
     return menu
 
+  def on_vte_title_change(self, vte):
+    vte.set_property ("has-tooltip", True)
+    vte.set_property ("tooltip-text", vte.get_window_title ())
+
   def get_box (self):
     return self._box