diff --git a/src/FolderManager/FolderItem.vala b/src/FolderManager/FolderItem.vala
index 136c1486e..1c357e1ff 100644
--- a/src/FolderManager/FolderItem.vala
+++ b/src/FolderManager/FolderItem.vala
@@ -118,10 +118,8 @@ namespace Scratch.FolderManager {
 
             var rename_menu_item = new Gtk.MenuItem.with_label (_("Rename"));
             rename_menu_item.activate.connect (() => {
-                var prev_selected = (Item)(view.selected);
                 selectable = true;
                 if (view.start_editing_item (this)) {
-                    warning ("start editing");
                     // Need to poll view as no signal emited when editing cancelled and need to set
                     // selectable to false anyway.
                     Timeout.add (200, () => {
@@ -129,7 +127,6 @@ namespace Scratch.FolderManager {
                             return Source.CONTINUE;
                         } else {
                             selectable = false;
-                            view.select_path (prev_selected.file.path);
                         }
 
                         return Source.REMOVE;