diff --git a/app/docker/views/volumes/edit/volume.html b/app/docker/views/volumes/edit/volume.html
index afdc9048e..eb4a6a795 100644
--- a/app/docker/views/volumes/edit/volume.html
+++ b/app/docker/views/volumes/edit/volume.html
@@ -14,7 +14,7 @@
                 <button
                   ng-if="showBrowseAction"
                   class="btn btn-xs btn-primary"
-                  ui-sref="docker.volumes.volume.browse({ id: volume.Id, nodeName: volume.NodeName })"
+                  ui-sref="docker.volumes.volume.browse({ id: volume.Name, nodeName: volume.NodeName })"
                   authorization="DockerAgentBrowseList"
                 >
                   <pr-icon icon="'search'" class="leading-none"></pr-icon>
diff --git a/app/docker/views/volumes/edit/volumeController.js b/app/docker/views/volumes/edit/volumeController.js
index b5e38213c..84ced2639 100644
--- a/app/docker/views/volumes/edit/volumeController.js
+++ b/app/docker/views/volumes/edit/volumeController.js
@@ -58,6 +58,8 @@ angular.module('portainer.docker').controller('VolumeController', [
 
           var containers = dataContainers.map(function (container) {
             container.volumeData = getVolumeDataFromContainer(container, $scope.volume.Id);
+
+            $scope.volume.NodeName = container.NodeName || '';
             return container;
           });
           $scope.containersUsingVolume = containers;
diff --git a/app/react/docker/volumes/ListView/VolumesDatatable/columns/name.tsx b/app/react/docker/volumes/ListView/VolumesDatatable/columns/name.tsx
index 1758ae940..98ee0e170 100644
--- a/app/react/docker/volumes/ListView/VolumesDatatable/columns/name.tsx
+++ b/app/react/docker/volumes/ListView/VolumesDatatable/columns/name.tsx
@@ -81,7 +81,7 @@ function Cell({
       <Link
         to=".volume"
         params={{
-          id: item.Id,
+          id: item.Name,
           nodeName: item.NodeName,
         }}
         data-cy={`volume-link-${name}`}
@@ -99,7 +99,7 @@ function Cell({
             props={{
               to: 'docker.volumes.volume.browse',
               params: {
-                id: item.Id,
+                id: item.Name,
                 nodeName: item.NodeName,
               },
             }}