diff --git a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
index aa40ff897..47f93e0f6 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
@@ -16,7 +16,7 @@ import { updateOrientationMarkers } from '../../../lib/updateOrientationMarkers'
 import { getInstanceClassDefaultViewport } from '../../../lib/instanceClassSpecificViewport';
 import { OHIFError } from '../../../lib/classes/OHIFError';
 
-const allCornerstoneEvents = 'CornerstoneToolsMouseDown CornerstoneToolsMouseDownActivate ' +
+const allCornerstoneEvents = 'click CornerstoneToolsMouseDown CornerstoneToolsMouseDownActivate ' +
     'CornerstoneToolsMouseClick CornerstoneToolsMouseDrag CornerstoneToolsMouseUp ' +
     'CornerstoneToolsMouseWheel CornerstoneToolsTap CornerstoneToolsTouchPress ' +
     'CornerstoneToolsTouchStart CornerstoneToolsTouchStartActive ' +
@@ -384,17 +384,15 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
             // Check if the current active viewport in the Meteor Session
             // Is the same as the viewport in which the activation event was fired.
             // If it was, no changes are necessary, so stop here.
-            const element = eventData.element;
             const activeViewportIndex = Session.get('activeViewport');
-            const viewportIndex = $('.imageViewerViewport').index(element);
-
-            // Reset the focus, even if we don't need to re-enable reference lines or prefetching
-            $(element).focus();
-
             if (viewportIndex === activeViewportIndex) {
                 return;
             }
 
+            // Reset the focus, even if we don't need to re-enable reference lines or prefetching
+            const element = eventData.element;
+            $(element).focus();
+
             OHIF.log.info('imageViewerViewport sendActivationTrigger');
 
             // Otherwise, trigger an 'OHIFActivateViewport' event to be handled by the Template event
@@ -599,10 +597,6 @@ Template.imageViewerViewport.events({
         setActiveViewport(event.currentTarget);
     },
 
-    'click .imageViewerViewport'(event) {
-        setActiveViewport(event.currentTarget);
-    },
-
     'CornerstoneToolsMouseDoubleClick .imageViewerViewport, CornerstoneToolsDoubleTap .imageViewerViewport'(event) {
         // Get the double clicked viewport index
         const viewportIndex = $('.imageViewerViewport').index(event.currentTarget);