diff --git a/src/components/color-picker/hsaMixin.js b/src/components/color-picker/hsaMixin.js
index 3f904d0..83d6350 100644
--- a/src/components/color-picker/hsaMixin.js
+++ b/src/components/color-picker/hsaMixin.js
@@ -1,6 +1,7 @@
 import Emitter from '../../mixins/emitter';
 import handleEscapeMixin from './handleEscapeMixin';
 import {getTouches} from './utils';
+import { on, off } from '../../utils/dom';
 
 export default {
     mixins: [Emitter, handleEscapeMixin],
@@ -42,15 +43,19 @@ export default {
         handleMouseDown(e) {
             this.dispatch('ColorPicker', 'on-dragging', true);
             this.handleChange(e, true);
-            window.addEventListener('mousemove', this.handleChange, false);
-            window.addEventListener('mouseup', this.handleMouseUp, false);
+            // window.addEventListener('mousemove', this.handleChange, false);
+            // window.addEventListener('mouseup', this.handleMouseUp, false);
+            on(window, 'mousemove', this.handleChange);
+            on(window, 'mouseup', this.handleMouseUp);
         },
         handleMouseUp() {
             this.unbindEventListeners();
         },
         unbindEventListeners() {
-            window.removeEventListener('mousemove', this.handleChange);
-            window.removeEventListener('mouseup', this.handleMouseUp);
+            // window.removeEventListener('mousemove', this.handleChange);
+            // window.removeEventListener('mouseup', this.handleMouseUp);
+            off(window, 'mousemove', this.handleChange);
+            off(window, 'mouseup', this.handleMouseUp);
             // This timeout is required so that the click handler for click-outside
             // has the chance to run before the mouseup removes the dragging flag.
             setTimeout(() => this.dispatch('ColorPicker', 'on-dragging', false), 1);
diff --git a/src/components/color-picker/saturation.vue b/src/components/color-picker/saturation.vue
index a36bf96..744d563 100644
--- a/src/components/color-picker/saturation.vue
+++ b/src/components/color-picker/saturation.vue
@@ -29,6 +29,7 @@
 import HSAMixin from './hsaMixin';
 import Prefixes from './prefixMixin';
 import {clamp, getIncrement} from './utils';
+import { on, off } from '../../utils/dom';
 
 export default {
     name: 'Saturation',
@@ -87,11 +88,13 @@ export default {
         },
         handleMouseDown(e) {
             HSAMixin.methods.handleMouseDown.call(this, e);
-            window.addEventListener('mouseup', this.handleChange, false);
+//            window.addEventListener('mouseup', this.handleChange, false);
+            on(window, 'mouseup', this.handleChange);
         },
         unbindEventListeners(e) {
             HSAMixin.methods.unbindEventListeners.call(this, e);
-            window.removeEventListener('mouseup', this.handleChange);
+//            window.removeEventListener('mouseup', this.handleChange);
+            off(window, 'mouseup', this.handleChange);
         },
     },
 };
--
libgit2 0.21.4