diff --git a/plugins/file-manager/file-view.c b/plugins/file-manager/file-view.c
index 8f027f9..74dfc2c 100644
--- a/plugins/file-manager/file-view.c
+++ b/plugins/file-manager/file-view.c
@@ -35,7 +35,10 @@
 
 #define HAVE_TOOLTIP_API (GTK_MAJOR_VERSION > 2 || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 12))
 #include <glib/gi18n.h>
+#include <glib/gprintf.h>
+#include <glib/gstdio.h>
 
+#include <libanjuta/anjuta-utils.h>
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/anjuta-vcs-status.h>
 
@@ -119,12 +122,49 @@ file_view_refresh (AnjutaFileView* view)
 
 void file_view_rename (AnjutaFileView* view)
 {
-	/* TODO */
+	gchar * rep = NULL ;
+	gchar * newFilename ;
+	gchar * oldPath ;
+	gchar * fileBasename ;
+	gboolean valid ;
+	GFile * file = file_view_get_selected(view) ;
+	GFile * parent = NULL ;
+	
+	if(!g_file_has_parent(file, NULL)) {/* You try to rename "/" */
+		anjuta_util_dialog_error(NULL, _("You can't rename \"/\"!"), NULL);
+		return ;
+	}
+
+	fileBasename = g_file_get_basename(file) ;
+	/* Ask the new filename */
+	valid = anjuta_util_dialog_input(NULL,_("Please enter the new file name"),
+	                         fileBasename,
+	                         &rep);
+	if(valid) {		
+		parent = g_file_get_parent(file) ;
+		oldPath = g_file_get_path (parent) ;
+		
+		/* Creating of the new filename */
+		newFilename = g_strconcat(oldPath, "/", rep, NULL);
+		if(g_rename(fileBasename, newFilename))
+			anjuta_util_dialog_error(NULL,
+_("An error has occured!\n\
+Maybe you permissions're insuficient or the filename is wrong")
+			                         , NULL);
+		g_object_unref(parent) ;
+		g_free(newFilename) ;
+		g_free(oldPath) ;
+	}
+	g_object_unref(file) ;
+	g_free(rep) ;
+	g_free(fileBasename) ;
 }
 
 gboolean file_view_can_rename (AnjutaFileView* view)
 {
-	/* TODO */
+	/* TODO 
+	 * Maybe it can be use for windows (look if file is already open)
+	 */
 	return FALSE;
 }
 
diff --git a/plugins/file-manager/plugin.c b/plugins/file-manager/plugin.c
index 2ebaf75..003c911 100644
--- a/plugins/file-manager/plugin.c
+++ b/plugins/file-manager/plugin.c
@@ -316,8 +316,9 @@ on_file_view_show_popup_menu (AnjutaFileView* view, GFile* file,
 									   "/PopupFileManager");
 	rename = gtk_ui_manager_get_widget (GTK_UI_MANAGER (ui),
 									   "/PopupFileManager/PopupFileManagerRename");
-	/* TODO */
-	gtk_widget_hide (rename);
+
+	g_return_if_fail (GTK_IS_WIDGET (rename));
+	gtk_menu_popup (GTK_MENU (rename), NULL, NULL, NULL, NULL, button, time);
 	
 	g_return_if_fail (GTK_IS_WIDGET (popup));
 	gtk_menu_popup (GTK_MENU (popup), NULL, NULL, NULL, NULL, button, time);
