diff --git a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
index be7fdd162..d0b5e50d9 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
@@ -278,7 +278,7 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
         }
 
         // Instantiate the tools
-        toolManager.instantiateTools();
+        toolManager.instantiateTools(element);
 
         // Use the tool manager to enable the currently active tool for this
         // newly rendered element
diff --git a/Packages/ohif-viewerbase/client/lib/toolManager.js b/Packages/ohif-viewerbase/client/lib/toolManager.js
index d569d64f6..28b37bcae 100644
--- a/Packages/ohif-viewerbase/client/lib/toolManager.js
+++ b/Packages/ohif-viewerbase/client/lib/toolManager.js
@@ -173,12 +173,12 @@ export const toolManager = {
         Session.set('ToolManagerActiveToolUpdated', Random.id());
     },
 
-    instantiateTools() {
-        // Instantiate all cornerstone tools for all enabled elements
+    instantiateTools(element) {
+        // Instantiate all cornerstone tools for the given element
         Object.keys(tools).forEach(toolName => {
             const apiTool = cornerstoneTools[tools[toolName]];
             if (apiTool) {
-                cornerstoneTools.addTool(apiTool, {
+                cornerstoneTools.addToolForElement(element, apiTool, {
                     name: toolName,
                     configuration: defaultToolConfig
                 });