diff --git a/data/xedit.desktop.in.in b/data/xedit.desktop.in.in
index 347b2c7..c62317a 100644
--- a/data/xedit.desktop.in.in
+++ b/data/xedit.desktop.in.in
@@ -1,6 +1,5 @@
 [Desktop Entry]
-_Name=Xedit
-_GenericName=Text Editor
+_Name=Text Editor
 _Comment=Edit text files
 Exec=xedit %U
 Terminal=false
@@ -9,6 +8,5 @@ StartupNotify=true
 MimeType=text/plain;
 Icon=accessories-text-editor
 Categories=GTK;Utility;TextEditor;
-Keywords=text;editor;MATE;tabs;highlighting;code;multiple;files;pluggable;
+Keywords=text;editor;tabs;highlighting;code;multiple;files;pluggable;
 X-MATE-DocPath=xedit/xedit.xml
-_X-MATE-FullName=Xedit Text Editor
diff --git a/xedit/xedit-window.c b/xedit/xedit-window.c
index 4fc52c0..acb3b5d 100644
--- a/xedit/xedit-window.c
+++ b/xedit/xedit-window.c
@@ -2175,23 +2175,23 @@ set_title (XeditWindow *window)
 	if (xedit_document_get_readonly (doc)) 
 	{
 		if (dirname != NULL)
-			title = g_strdup_printf ("%s [%s] (%s) - Xedit",
+			title = g_strdup_printf ("%s [%s] (%s)",
 						 name, 
 						 _("Read-Only"), 
 						 dirname);
 		else
-			title = g_strdup_printf ("%s [%s] - Xedit",
+			title = g_strdup_printf ("%s [%s]",
 						 name, 
 						 _("Read-Only"));
 	} 
 	else 
 	{
 		if (dirname != NULL)
-			title = g_strdup_printf ("%s (%s) - Xedit",
+			title = g_strdup_printf ("%s (%s)",
 						 name, 
 						 dirname);
 		else
-			title = g_strdup_printf ("%s - Xedit",
+			title = g_strdup_printf ("%s",
 						 name);
 	}