Fix renaming shortcut for files selected via selection button and popup

button

BUG: 425436
(cherry picked from commit 6925dd2f)

containments/desktop/package/contents/ui/FolderItemDelegate.qml

@@ -400,7 +400,10 @@ Item {
                     FolderItemActionButton {
                         element: model.selected ? "remove" : "add"
 
-                        onClicked: dir.toggleSelected(positioner.map(index))
+                        onClicked: {
+                            dir.toggleSelected(positioner.map(index))
+                            main.GridView.view.currentIndex = index
+                        }
                     }
                 }
 
@@ -414,6 +417,7 @@ Item {
 
                         onClicked: {
                             dir.setSelected(positioner.map(index))
+                            main.GridView.view.currentIndex = index
                             openPopup();
                         }
                     }