diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c
index 8d358d13..744a0551 100644
--- a/src/fe-gtk/gtkutil.c
+++ b/src/fe-gtk/gtkutil.c
@@ -323,15 +323,22 @@ gtkutil_file_req (const char *title, void *callback, void *userdata, char *filte
 static gboolean
 gtkutil_esc_destroy (GtkWidget * win, GdkEventKey * key, gpointer userdata)
 {
-	GtkWidget *wid = win;
+	GtkWidget *wid;
+
+	/* Destroy the window of detached utils */
+	if (!gtk_widget_is_toplevel (win))
+	{
+		if (gdk_window_get_type_hint (gtk_widget_get_window (win)) == GDK_WINDOW_TYPE_HINT_DIALOG)
+			wid = gtk_widget_get_parent (win);
+		else
+			return FALSE;
+	}
+	else
+		wid = win;
 
-	/* Kill the window of detached utils */
-	if (gtk_window_get_type_hint (GTK_WINDOW (gtk_widget_get_parent (win))) == GDK_WINDOW_TYPE_HINT_DIALOG)
-		wid = gtk_widget_get_parent (win);
-		
 	if (key->keyval == GDK_Escape)
-		gtk_widget_destroy (wid); /* FIXME: leaves empty tabs */
-
+		gtk_widget_destroy (wid);
+			
 	return FALSE;
 }