diff --git a/src/Context.cpp b/src/Context.cpp
index 075379f49..c2e711c3d 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -765,9 +765,16 @@ void Context::updateXtermTitle ()
   {
     std::string command = parser.getCommand ();
     std::string title;
+    Tree* tree = parser.tree ();
+    std::vector <Tree*>::iterator i;
+    for (i = tree->_branches.begin (); i != tree->_branches.end (); ++i)
+    {
+      if (i != tree->_branches.begin ())
+        title += ' ';
+
+      title += (*i)->attribute ("raw");
+    }
 
-    // TODO Obsolete.
-    join (title, " ", a3.list ());
     std::cout << "]0;task " << command << " " << title << "";
   }
 }