diff --git a/ChangeLog b/ChangeLog
index 601231d24da4cc5758f4a8721c971398ea2c0175..8db7e5f82f166f838094dbddb8f51f97fb3fd3fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-08	Benedikt Meurer <benny@xfce.org>
+
+	* thunar/thunar-shortcuts-view.c: Fix shortcut rename.
+
 2006-03-08	Benedikt Meurer <benny@xfce.org>
 
 	* thunar/thunar-shortcuts-view.c: Always open shortcuts using single
diff --git a/thunar/thunar-shortcuts-view.c b/thunar/thunar-shortcuts-view.c
index c38fe7ab94bc1ec9a5db54590018c17299940c6e..b27c4f26787c346aa828b32139ba48ffcf1a4761 100644
--- a/thunar/thunar-shortcuts-view.c
+++ b/thunar/thunar-shortcuts-view.c
@@ -694,7 +694,6 @@ thunar_shortcuts_view_rename_activated (GtkWidget           *item,
                                         ThunarShortcutsView *view)
 {
   GtkTreeRowReference *row;
-  GtkCellRendererMode  mode;
   GtkTreeViewColumn   *column;
   GtkCellRenderer     *renderer;
   GtkTreePath         *path;
@@ -710,15 +709,11 @@ thunar_shortcuts_view_rename_activated (GtkWidget           *item,
       renderer = g_list_nth_data (renderers, 1);
 
       /* make sure the text renderer is editable */
-      mode = renderer->mode;
-      renderer->mode = GTK_CELL_RENDERER_MODE_EDITABLE;
+      g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL);
 
       /* tell the tree view to start editing the given row */
       gtk_tree_view_set_cursor_on_cell (GTK_TREE_VIEW (view), path, column, renderer, TRUE);
 
-      /* reset the text renderer mode */
-      renderer->mode = mode;
-
       /* cleanup */
       gtk_tree_path_free (path);
       g_list_free (renderers);
@@ -736,6 +731,9 @@ thunar_shortcuts_view_renamed (GtkCellRenderer     *renderer,
   GtkTreeModel *model;
   GtkTreeIter   iter;
 
+  /* reset the editable flag */
+  g_object_set (G_OBJECT (renderer), "editable", FALSE, NULL);
+
   /* perform the rename */
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
   if (gtk_tree_model_get_iter_from_string (model, &iter, path_string))