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 7ece9230c4..a3e5f07817 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,15 +38,15 @@
       <umb-folder-grid
          ng-if="folders.length > 0"
          folders="folders"
-         on-select="vm.selectFolder"
-         on-click="vm.clickFolder">
+         on-click="vm.selectFolder"
+         on-click-name="vm.goToItem">
       </umb-folder-grid>
 
       <umb-media-grid
          items="vm.itemsWithoutFolders"
          on-details-hover="vm.hoverMediaItemDetails"
-         on-click="vm.clickItem"
-         on-click-name="vm.clickItemName">
+         on-click="vm.selectItem"
+         on-click-name="vm.goToItem">
       </umb-media-grid>
 
       <umb-tooltip
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 e2c864cc87..0d326a1d22 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
@@ -26,11 +26,9 @@
       vm.onUploadComplete = onUploadComplete;
 
       vm.hoverMediaItemDetails = hoverMediaItemDetails;
-      vm.clickFolder = clickFolder;
-      vm.clickItem = clickItem;
+      vm.selectItem = selectItem;
       vm.selectFolder = selectFolder;
-      vm.clickItemName = clickItemName;
-      vm.openFolder = openFolder;
+      vm.goToItem = goToItem;
 
       function activate() {
           vm.itemsWithoutFolders = filterOutFolders($scope.items);
@@ -88,24 +86,16 @@
 
       }
 
-      function clickFolder(folder) {
-          $location.path($scope.entityType + '/' + $scope.entityType + '/edit/' + folder.id);
-      }
-
-      function clickItem(item, $event, $index) {
+      function selectItem(item, $event, $index) {
           listViewHelper.selectHandler(item, $index, vm.itemsWithoutFolders, $scope.selection, $event);
       }
 
-      function clickItemName(item, $event, $index) {
-          $location.path($scope.entityType + '/' + $scope.entityType + '/edit/' + item.id);
-      }
-
       function selectFolder(folder, $event, $index) {
           listViewHelper.selectHandler(folder, $index, $scope.folders, $scope.selection, $event);
       }
 
-      function openFolder(folder, $event, $index) {
-          $location.path($scope.entityType + '/' + $scope.entityType + '/edit/' + folder.id);
+      function goToItem(item, $event, $index) {
+          $location.path($scope.entityType + '/' + $scope.entityType + '/edit/' + item.id);
       }
 
       activate();