diff --git a/Packages/ohif-cornerstone/client/index.js b/Packages/ohif-cornerstone/client/index.js
index 8580aa70a..464571ff5 100644
--- a/Packages/ohif-cornerstone/client/index.js
+++ b/Packages/ohif-cornerstone/client/index.js
@@ -1,5 +1,6 @@
 import { OHIF } from '../namespace';
 import './renderer.js';
 
+import './lib/cornerstoneToolsMouseInputOverrides.js';
 import { MetadataProvider } from './lib/classes/MetadataProvider';
 OHIF.cornerstone.metadataProvider = new MetadataProvider();
diff --git a/Packages/ohif-cornerstone/client/lib/cornerstoneToolsMouseInputOverrides.js b/Packages/ohif-cornerstone/client/lib/cornerstoneToolsMouseInputOverrides.js
new file mode 100644
index 000000000..26c53292c
--- /dev/null
+++ b/Packages/ohif-cornerstone/client/lib/cornerstoneToolsMouseInputOverrides.js
@@ -0,0 +1,309 @@
+// This override was included due to an issue with tools handles on Safari, Firefox and IE/Edge
+// TODO: Remove this override after the pull-request is accepted and the new version of
+// cornerstoneTools is updated on the ohif:cornerstone package.
+// Pull request: https://github.com/chafey/cornerstoneTools/pull/230
+
+import { cornerstone, cornerstoneTools, cornerstoneMath } from 'meteor/ohif:cornerstone';
+cornerstoneTools.copyPoints
+const { copyPoints, pauseEvent } = cornerstoneTools;
+
+let isClickEvent = true;
+let preventClickTimeout;
+const clickDelay = 200;
+
+function getEventWhich (event) {
+  if (typeof event.buttons !== 'number') {
+    return event.which;
+  }
+
+  if (event.buttons === 0) {
+    return 0;
+  } else if (event.buttons % 2 === 1) {
+    return 1;
+  } else if (event.buttons % 4 === 2) {
+    return 3;
+  } else if (event.buttons % 8 === 4) {
+    return 2;
+  }
+
+  return 0;
+}
+
+function preventClickHandler () {
+  isClickEvent = false;
+}
+
+function activateMouseDown (mouseEventDetail) {
+  $(mouseEventDetail.element).trigger('CornerstoneToolsMouseDownActivate', mouseEventDetail);
+}
+
+function mouseDoubleClick (e) {
+  const element = e.currentTarget;
+  const eventType = 'CornerstoneToolsMouseDoubleClick';
+
+  const startPoints = {
+    page: cornerstoneMath.point.pageToPoint(e),
+    image: cornerstone.pageToPixel(element, e.pageX, e.pageY),
+    client: {
+      x: e.clientX,
+      y: e.clientY
+    }
+  };
+
+  startPoints.canvas = cornerstone.pixelToCanvas(element, startPoints.image);
+
+  const lastPoints = copyPoints(startPoints);
+  const eventData = {
+    event: e,
+    which: getEventWhich(e),
+    viewport: cornerstone.getViewport(element),
+    image: cornerstone.getEnabledElement(element).image,
+    element,
+    startPoints,
+    lastPoints,
+    currentPoints: startPoints,
+    deltaPoints: {
+      x: 0,
+      y: 0
+    },
+    type: eventType
+  };
+
+  const event = $.Event(eventType, eventData);
+
+  $(eventData.element).trigger(event, eventData);
+}
+
+function mouseDown (e) {
+  preventClickTimeout = setTimeout(preventClickHandler, clickDelay);
+
+  const element = e.currentTarget;
+  const eventType = 'CornerstoneToolsMouseDown';
+
+    // Prevent CornerstoneToolsMouseMove while mouse is down
+  $(element).off('mousemove', mouseMove);
+
+  const startPoints = {
+    page: cornerstoneMath.point.pageToPoint(e),
+    image: cornerstone.pageToPixel(element, e.pageX, e.pageY),
+    client: {
+      x: e.clientX,
+      y: e.clientY
+    }
+  };
+
+  startPoints.canvas = cornerstone.pixelToCanvas(element, startPoints.image);
+
+  let lastPoints = copyPoints(startPoints);
+  const eventData = {
+    event: e,
+    which: getEventWhich(e),
+    viewport: cornerstone.getViewport(element),
+    image: cornerstone.getEnabledElement(element).image,
+    element,
+    startPoints,
+    lastPoints,
+    currentPoints: startPoints,
+    deltaPoints: {
+      x: 0,
+      y: 0
+    },
+    type: eventType
+  };
+
+  const event = $.Event(eventType, eventData);
+
+  $(eventData.element).trigger(event, eventData);
+
+  if (event.isImmediatePropagationStopped() === false) {
+        // No tools responded to this event, give the active tool a chance
+    if (activateMouseDown(eventData) === true) {
+      return pauseEvent(e);
+    }
+  }
+
+  const whichMouseButton = getEventWhich(e);
+
+  function onMouseMove (e) {
+        // Calculate our current points in page and image coordinates
+    const eventType = 'CornerstoneToolsMouseDrag';
+    const currentPoints = {
+      page: cornerstoneMath.point.pageToPoint(e),
+      image: cornerstone.pageToPixel(element, e.pageX, e.pageY),
+      client: {
+        x: e.clientX,
+        y: e.clientY
+      }
+    };
+
+    currentPoints.canvas = cornerstone.pixelToCanvas(element, currentPoints.image);
+
+        // Calculate delta values in page and image coordinates
+    const deltaPoints = {
+      page: cornerstoneMath.point.subtract(currentPoints.page, lastPoints.page),
+      image: cornerstoneMath.point.subtract(currentPoints.image, lastPoints.image),
+      client: cornerstoneMath.point.subtract(currentPoints.client, lastPoints.client),
+      canvas: cornerstoneMath.point.subtract(currentPoints.canvas, lastPoints.canvas)
+    };
+
+    const eventData = {
+      which: whichMouseButton,
+      viewport: cornerstone.getViewport(element),
+      image: cornerstone.getEnabledElement(element).image,
+      element,
+      startPoints,
+      lastPoints,
+      currentPoints,
+      deltaPoints,
+      type: eventType,
+      ctrlKey: e.ctrlKey,
+      metaKey: e.metaKey,
+      shiftKey: e.shiftKey
+    };
+
+    $(eventData.element).trigger(eventType, eventData);
+
+        // Update the last points
+    lastPoints = copyPoints(currentPoints);
+
+        // Prevent left click selection of DOM elements
+    return pauseEvent(e);
+  }
+
+    // Hook mouseup so we can unbind our event listeners
+    // When they stop dragging
+  function onMouseUp (e) {
+        // Cancel the timeout preventing the click event from triggering
+    clearTimeout(preventClickTimeout);
+
+    let eventType = 'CornerstoneToolsMouseUp';
+
+    if (isClickEvent) {
+      eventType = 'CornerstoneToolsMouseClick';
+    }
+
+        // Calculate our current points in page and image coordinates
+    const currentPoints = {
+      page: cornerstoneMath.point.pageToPoint(e),
+      image: cornerstone.pageToPixel(element, e.pageX, e.pageY),
+      client: {
+        x: e.clientX,
+        y: e.clientY
+      }
+    };
+
+    currentPoints.canvas = cornerstone.pixelToCanvas(element, currentPoints.image);
+
+        // Calculate delta values in page and image coordinates
+    const deltaPoints = {
+      page: cornerstoneMath.point.subtract(currentPoints.page, lastPoints.page),
+      image: cornerstoneMath.point.subtract(currentPoints.image, lastPoints.image),
+      client: cornerstoneMath.point.subtract(currentPoints.client, lastPoints.client),
+      canvas: cornerstoneMath.point.subtract(currentPoints.canvas, lastPoints.canvas)
+    };
+
+    const eventData = {
+      event: e,
+      which: whichMouseButton,
+      viewport: cornerstone.getViewport(element),
+      image: cornerstone.getEnabledElement(element).image,
+      element,
+      startPoints,
+      lastPoints,
+      currentPoints,
+      deltaPoints,
+      type: eventType
+    };
+
+    const event = $.Event(eventType, eventData);
+
+    $(eventData.element).trigger(event, eventData);
+
+    $(document).off('mousemove', onMouseMove);
+    $(document).off('mouseup', onMouseUp);
+
+    $(eventData.element).on('mousemove', mouseMove);
+
+    isClickEvent = true;
+  }
+
+  $(document).on('mousemove', onMouseMove);
+  $(document).on('mouseup', onMouseUp);
+
+  return pauseEvent(e);
+}
+
+function mouseMove (e) {
+  const element = e.currentTarget;
+  const eventType = 'CornerstoneToolsMouseMove';
+
+  const startPoints = {
+    page: cornerstoneMath.point.pageToPoint(e),
+    image: cornerstone.pageToPixel(element, e.pageX, e.pageY),
+    client: {
+      x: e.clientX,
+      y: e.clientY
+    }
+  };
+
+  startPoints.canvas = cornerstone.pixelToCanvas(element, startPoints.image);
+
+  let lastPoints = copyPoints(startPoints);
+
+  const whichMouseButton = getEventWhich(e);
+
+    // Calculate our current points in page and image coordinates
+  const currentPoints = {
+    page: cornerstoneMath.point.pageToPoint(e),
+    image: cornerstone.pageToPixel(element, e.pageX, e.pageY),
+    client: {
+      x: e.clientX,
+      y: e.clientY
+    }
+  };
+
+  currentPoints.canvas = cornerstone.pixelToCanvas(element, currentPoints.image);
+
+    // Calculate delta values in page and image coordinates
+  const deltaPoints = {
+    page: cornerstoneMath.point.subtract(currentPoints.page, lastPoints.page),
+    image: cornerstoneMath.point.subtract(currentPoints.image, lastPoints.image),
+    client: cornerstoneMath.point.subtract(currentPoints.client, lastPoints.client),
+    canvas: cornerstoneMath.point.subtract(currentPoints.canvas, lastPoints.canvas)
+  };
+
+  const eventData = {
+    which: whichMouseButton,
+    viewport: cornerstone.getViewport(element),
+    image: cornerstone.getEnabledElement(element).image,
+    element,
+    startPoints,
+    lastPoints,
+    currentPoints,
+    deltaPoints,
+    type: eventType
+  };
+
+  $(element).trigger(eventType, eventData);
+
+    // Update the last points
+  lastPoints = copyPoints(currentPoints);
+}
+
+function disable (element) {
+  $(element).off('mousedown', mouseDown);
+  $(element).off('mousemove', mouseMove);
+  $(element).off('dblclick', mouseDoubleClick);
+}
+
+function enable (element) {
+    // Prevent handlers from being attached multiple times
+  disable(element);
+
+  $(element).on('mousedown', mouseDown);
+  $(element).on('mousemove', mouseMove);
+  $(element).on('dblclick', mouseDoubleClick);
+}
+
+cornerstoneTools.mouseInput.enable = enable;
+cornerstoneTools.mouseInput.disable = disable;
diff --git a/Packages/ohif-cornerstone/main.js b/Packages/ohif-cornerstone/main.js
index c706f38b2..4e2d880dd 100644
--- a/Packages/ohif-cornerstone/main.js
+++ b/Packages/ohif-cornerstone/main.js
@@ -8,14 +8,14 @@ import { OHIF } from './namespace.js';
  * Import scripts that will populate the Cornerstone namespace as a side effect only import. This is effectively the public API...
  */
 
-import './client/'; // which is actually: import './client/index.js';
-
 import * as cornerstone from 'cornerstone-core';
 import * as cornerstoneTools from 'cornerstone-tools';
 import * as cornerstoneMath from 'cornerstone-math';
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
 import * as dicomParser from 'dicom-parser';
 
+import './client/'; // which is actually: import './client/index.js';
+
 export {
     cornerstone,
     cornerstoneTools,