diff --git a/libnautilus-private/nautilus-progress-info.c b/libnautilus-private/nautilus-progress-info.c
index ac182d8..8ab24c6 100644
--- a/libnautilus-private/nautilus-progress-info.c
+++ b/libnautilus-private/nautilus-progress-info.c
@@ -204,6 +204,38 @@ status_icon_activate_cb (GtkStatusIcon *icon,
 	}
 }
 
+static char *
+create_progress_window_title (double progress, int n_ops)
+{
+	if (n_ops > 1) {
+		/* Translators: the first %d is the global completed
+		   percentage of all file operations currently running, the
+		   second %d is the number of file operations currently
+		   running. */
+		return g_strdup_printf (_("%d%% of %'d tasks - File Operations"),
+					(int) (progress * 100), n_ops);
+	}
+	if (n_ops == 1) {
+		return g_strdup_printf (_("%d%% completed - File Operations"),
+					(int) (progress * 100));
+	}
+	return g_strdup (_("File Operations"));
+}
+
+static char *
+create_progress_icon_tooltip (double progress, int n_ops)
+{
+	if (n_ops > 1) {
+		return g_strdup_printf (_("%'d active file operations (%d%% completed)"),
+					n_ops, (int) (progress * 100));
+	}
+	if (n_ops == 1) {
+		return g_strdup_printf (_("One active file operation (%d%% completed)"),
+					(int) (progress * 100));
+	}
+	return g_strdup (_("Active file operations"));
+}
+
 static GtkWidget *
 get_progress_window (void)
 {
@@ -250,6 +282,51 @@ get_progress_window (void)
 	return progress_window;
 }
 
+static void
+update_status_icon_and_window (void)
+{
+	double	 progress;
+	double	 total_progress;
+	int	 n_valid_progress_ops;
+	GList	*l, *active_progress_infos_copy;
+	char	*window_title, *icon_tooltip;
+
+	total_progress	     = 0.0;
+	n_valid_progress_ops = 0;
+
+	if (n_progress_ops == 0) {
+		gtk_status_icon_set_visible (status_icon, FALSE);
+		gtk_widget_hide (get_progress_window ());
+		return;
+	} else {
+		gtk_status_icon_set_visible (status_icon, TRUE);
+	}
+
+	active_progress_infos_copy = nautilus_get_all_progress_info ();
+
+	for (l = active_progress_infos_copy; l != NULL; l = l->next) {
+		progress = nautilus_progress_info_get_progress (l->data);
+		if (progress >= 0.0) {
+			total_progress	     += progress;
+			n_valid_progress_ops += 1;
+		}
+	}
+
+	eel_g_object_list_free (active_progress_infos_copy);
+
+	total_progress = total_progress / n_valid_progress_ops;
+
+	window_title = create_progress_window_title (total_progress,
+						     n_valid_progress_ops);
+	gtk_window_set_title (GTK_WINDOW (get_progress_window ()),
+			      window_title);
+	g_free (window_title);
+
+	icon_tooltip = create_progress_icon_tooltip (total_progress,
+						     n_valid_progress_ops);
+	gtk_status_icon_set_tooltip_text (status_icon, icon_tooltip);
+	g_free (icon_tooltip);
+}
 
 typedef struct {
 	GtkWidget *widget;
@@ -294,26 +371,7 @@ update_progress (ProgressWidgetData *data)
 	} else {
 		gtk_progress_bar_set_fraction (data->progress_bar, progress);
 	}
-}
-
-static void
-update_status_icon_and_window (void)
-{
-	char *tooltip;
-
-	tooltip = g_strdup_printf (ngettext ("%'d file operation active",
-					     "%'d file operations active",
-					     n_progress_ops),
-				   n_progress_ops);
-	gtk_status_icon_set_tooltip_text (status_icon, tooltip);
-	g_free (tooltip);
-	
-	if (n_progress_ops == 0) {
-		gtk_status_icon_set_visible (status_icon, FALSE);
-		gtk_widget_hide (get_progress_window ());
-	} else {
-		gtk_status_icon_set_visible (status_icon, TRUE);
-	}
+	update_status_icon_and_window ();
 }
 
 static void
