diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
index bbc8edfdaa..9e87d95359 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
@@ -38,8 +38,8 @@
       <umb-folder-grid
          ng-if="folders.length > 0"
          folders="folders"
-         on-click-name="vm.clickFolderName"
-         on-click="vm.clickFolder">
+         on-click-name="vm.openFolder"
+         on-click="vm.selectFolder">
       </umb-folder-grid>
 
       <umb-media-grid
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
index 86ba02cb79..71a7caa345 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
@@ -27,10 +27,9 @@
 
       vm.hoverMediaItemDetails = hoverMediaItemDetails;
       vm.selectItem = selectItem;
-      vm.selectFolder = selectFolder;
       vm.clickItem = clickItem;
-      vm.clickFolder = clickFolder;
-      vm.clickFolderName = clickFolderName;
+      vm.selectFolder = selectFolder;
+      vm.openFolder = openFolder;
 
       function activate() {
           vm.itemsWithoutFolders = filterOutFolders($scope.items);
@@ -92,19 +91,15 @@
          listViewHelper.selectHandler(selectedItem, index, vm.itemsWithoutFolders, $scope.selection, $event);
       }
 
-      function selectFolder(selectedItem, $event, index) {
-         listViewHelper.selectHandler(selectedItem, index, $scope.folders, $scope.selection, $event);
-      }
-
       function clickItem(item) {
          $location.path($scope.entityType + '/' + $scope.entityType + '/edit/' + item.id);
       }
 
-      function clickFolder(folder, $event, $index) {
+      function selectFolder(folder, $event, $index) {
           listViewHelper.selectHandler(folder, $index, $scope.folders, $scope.selection, $event);
       }
 
-      function clickFolderName(folder, $event, $index) {
+      function openFolder(folder, $event, $index) {
           $location.path($scope.entityType + '/' + $scope.entityType + '/edit/' + folder.id);
       }