diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 02d0d3f..03e6dc2 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -415,6 +415,9 @@ terminal_screen_init (TerminalScreen *screen)
   priv->override_title = NULL;
   priv->user_title = FALSE;
   
+  g_signal_connect (screen, "grab-focus",
+                    G_CALLBACK (terminal_screen_window_title_changed),
+                    screen);
   g_signal_connect (screen, "window-title-changed",
                     G_CALLBACK (terminal_screen_window_title_changed),
                     screen);
@@ -1826,8 +1829,22 @@ static void
 terminal_screen_window_title_changed (VteTerminal *vte_terminal,
                                       TerminalScreen *screen)
 {
+  TerminalWindow *window;
+  window = terminal_screen_get_window (screen);
+  const char *title;
+  title=vte_terminal_get_window_title (vte_terminal);
+  
+  if (!gtk_window_is_active(GTK_WINDOW(window))) {
+    gtk_window_present (GTK_WINDOW(window));
+    terminal_window_switch_screen(window,screen);
+  }
+  else if (!gtk_widget_is_focus(GTK_WIDGET(screen))) {
+       
+      title=g_strconcat("Done : ",title,NULL);
+  }
+  
   terminal_screen_set_dynamic_title (screen,
-                                     vte_terminal_get_window_title (vte_terminal),
+                                     title,
 				     FALSE);
 }
 
