diff --git a/gnome/gtools.c b/gnome/gtools.c
index bc78d5cbe..ab8d30ff3 100644
--- a/gnome/gtools.c
+++ b/gnome/gtools.c
@@ -43,6 +43,9 @@ int query_dialog (char *header, char *text, int flags, int count, ...)
 	GList     *list;
 	int i, result = -1;
 	
+	if (header == MSG_ERROR)
+		header = _("Error");
+	
 	h = create_dlg (0, 0, 0, 0, dialog_colors, default_dlg_callback, "[QueryBox]", "query",
 			DLG_NO_TED | DLG_NO_TOPLEVEL);
 	dialog = GTK_DIALOG (gtk_dialog_new ());
@@ -116,9 +119,6 @@ Dlg_head *message (int error, char *header, char *text, ...)
 	char     buffer [4096];
 	Dlg_head *d;
 
-	if (header == MSG_ERROR)
-		header = _("Error");
-	
 	/* Setup the display information */
 	strcpy (buffer, "\n");
 	va_start (args, text);
diff --git a/src/wtools.c b/src/wtools.c
index 7cd85a8fe..591003c27 100644
--- a/src/wtools.c
+++ b/src/wtools.c
@@ -221,6 +221,9 @@ int query_dialog (char *header, char *text, int flags, int count, ...)
     query_colors [2] = (flags & D_ERROR) ? ERROR_COLOR : COLOR_HOT_NORMAL;
     query_colors [3] = (flags & D_ERROR) ? COLOR_HOT_NORMAL :  COLOR_HOT_FOCUS;
     
+    if (header == MSG_ERROR)
+	    header = _(" Error ");
+    
     if (count > 0){
 	va_start (ap, count);
 	for (i = 0; i < count; i++)
@@ -327,9 +330,6 @@ Dlg_head *message (int error, char *header, char *text, ...)
     char     buffer [4096];
     Dlg_head *d;
 
-    if (header == MSG_ERROR)
-	    header = _(" Error ");
-    
     /* Setup the display information */
     strcpy (buffer, "\n");
     va_start (args, text);