diff --git a/src/lib/viewers/image/ImageBaseViewer.js b/src/lib/viewers/image/ImageBaseViewer.js
index af6fcb226..d0d9fa609 100644
--- a/src/lib/viewers/image/ImageBaseViewer.js
+++ b/src/lib/viewers/image/ImageBaseViewer.js
@@ -347,15 +347,16 @@ class ImageBaseViewer extends BaseViewer {
     /**
      * @inheritdoc
      */
-    getPointModeClickHandler() {
-        if (!this.isAnnotatable('point')) {
+    getAnnotationModeClickHandler(mode) {
+        if (!mode || !this.isAnnotatable(mode)) {
             return null;
         }
 
+        const eventName = `toggle${mode}annotationmode`;
         return () => {
             this.imageEl.classList.remove(CSS_CLASS_ZOOMABLE);
             this.imageEl.classList.remove(CSS_CLASS_PANNABLE);
-            this.emit('togglepointannotationmode');
+            this.emit(eventName);
         };
     }
 
diff --git a/src/lib/viewers/image/__tests__/ImageBaseViewer-test.js b/src/lib/viewers/image/__tests__/ImageBaseViewer-test.js
index c007a3355..ce04b7272 100644
--- a/src/lib/viewers/image/__tests__/ImageBaseViewer-test.js
+++ b/src/lib/viewers/image/__tests__/ImageBaseViewer-test.js
@@ -26,6 +26,12 @@ describe('lib/viewers/image/ImageBaseViewer', () => {
         imageBase = new ImageBaseViewer(containerEl);
         imageBase.containerEl = containerEl;
         imageBase.imageEl = document.createElement('div');
+
+        event = {
+            preventDefault: sandbox.stub(),
+            stopPropagation: sandbox.stub(),
+            touches: [0, 0]
+        };
     });
 
     afterEach(() => {
@@ -38,6 +44,7 @@ describe('lib/viewers/image/ImageBaseViewer', () => {
 
         imageBase = null;
         stubs = {};
+        event = {};
     });
 
     describe('destroy()', () => {
@@ -468,6 +475,38 @@ describe('lib/viewers/image/ImageBaseViewer', () => {
         });
     });
 
+    describe('getAnnotationModeClickHandler()', () => {
+        beforeEach(() => {
+            stubs.isAnnotatable = sandbox.stub(imageBase, 'isAnnotatable').returns(false);
+        });
+
+        it('should return null if you cannot annotate', () => {
+            const handler = imageBase.getAnnotationModeClickHandler('point');
+            expect(stubs.isAnnotatable).to.be.called;
+            expect(handler).to.equal(null);
+        });
+
+        it('should return the toggle point mode handler', () => {
+            stubs.isAnnotatable.returns(true);
+            stubs.emitter = sandbox.stub(imageBase, 'emit');
+            imageBase.annotator = {
+                togglePointAnnotationHandler: () => {}
+            };
+            imageBase.imageEl.classList.add(CSS_CLASS_PANNABLE);
+            imageBase.imageEl.classList.add(CSS_CLASS_ZOOMABLE);
+
+            const handler = imageBase.getAnnotationModeClickHandler('point');
+            expect(stubs.isAnnotatable).to.be.called;
+            expect(handler).to.be.a('function');
+
+            handler(event);
+
+            expect(imageBase.imageEl).to.not.have.class(CSS_CLASS_PANNABLE);
+            expect(imageBase.imageEl).to.not.have.class(CSS_CLASS_ZOOMABLE);
+            expect(imageBase.emit).to.have.been.calledWith('togglepointannotationmode');
+        });
+    });
+
     describe('finishLoading()', () => {
         beforeEach(() => {
             imageBase.loaded = false;
diff --git a/src/lib/viewers/image/__tests__/ImageViewer-test.js b/src/lib/viewers/image/__tests__/ImageViewer-test.js
index 967af9271..c34e9fa78 100644
--- a/src/lib/viewers/image/__tests__/ImageViewer-test.js
+++ b/src/lib/viewers/image/__tests__/ImageViewer-test.js
@@ -587,7 +587,7 @@ describe('lib/viewers/image/ImageViewer', () => {
     describe('getPointModeClickHandler()', () => {
         it('should do nothing if not annotatable', () => {
             sandbox.stub(image, 'isAnnotatable').returns(false);
-            const handler = image.getPointModeClickHandler();
+            const handler = image.getAnnotationModeClickHandler('point');
             expect(handler).to.be.null;
         });
 
@@ -601,7 +601,7 @@ describe('lib/viewers/image/ImageViewer', () => {
             image.imageEl.classList.add(CSS_CLASS_PANNABLE);
             sandbox.stub(image, 'isAnnotatable').returns(true);
 
-            const handler = image.getPointModeClickHandler();
+            const handler = image.getAnnotationModeClickHandler('point');
             expect(handler).to.be.a('function');
 
             handler(event);