diff --git a/src/editor/components/seColorPicker.js b/src/editor/components/seColorPicker.js
index c527b1a70..94b3f8d98 100644
--- a/src/editor/components/seColorPicker.js
+++ b/src/editor/components/seColorPicker.js
@@ -171,11 +171,6 @@ export class SeColorPicker extends HTMLElement {
   connectedCallback () {
     this.paintBox = new PaintBox(this.$block, this.type);
     $(this.$picker).click(() => {
-      /* $(this.$color_picker)
-        .draggable({
-          cancel: '.jGraduate_tabs, .jGraduate_colPick, .jGraduate_gradPick, .jPicker',
-          containment: 'window'
-        }); */
       let {paint} = this.paintBox;
       jGraduateMethod(
         this.$color_picker,
diff --git a/src/editor/extensions/ext-overview_window/ext-overview_window.js b/src/editor/extensions/ext-overview_window/ext-overview_window.js
index 14c8d9b92..d6a2d7378 100644
--- a/src/editor/extensions/ext-overview_window/ext-overview_window.js
+++ b/src/editor/extensions/ext-overview_window/ext-overview_window.js
@@ -6,6 +6,7 @@
  * @copyright 2013 James Sacksteder
  *
  */
+import { dragmove } from '../../jquery-ui/dragmove.js';
 export default {
   name: 'overview_window',
   init ({$, isChrome}) {
@@ -104,12 +105,31 @@ export default {
       $('#workarea').scrollLeft(portX);
       $('#workarea').scrollTop(portY);
     };
-    $('#overview_window_view_box').draggable({
-      containment: 'parent',
-      drag: updateViewPortFromViewBox,
-      start () { overviewWindowGlobals.viewBoxDragging = true; },
-      stop () { overviewWindowGlobals.viewBoxDragging = false; }
-    });
+    const onStart = function () {
+      overviewWindowGlobals.viewBoxDragging = true;
+      updateViewPortFromViewBox();
+    };
+    const onEnd = function (el, parent, x, y) {
+      if((el.offsetLeft + el.offsetWidth) > $(parent).attr('width')){
+        el.style.left = ($(parent).attr('width') - el.offsetWidth) + 'px';
+      } else if(el.offsetLeft  < 0){
+        el.style.left = "0px"
+      }
+      if((el.offsetTop + el.offsetHeight) > $(parent).attr('height')){
+        el.style.top = ($(parent).attr('height') - el.offsetHeight) + 'px';
+      } else if(el.offsetTop  < 0){
+        el.style.top = "0px"
+      }
+      overviewWindowGlobals.viewBoxDragging = false;
+      updateViewPortFromViewBox();
+    };
+    const onDrag = function () {
+      updateViewPortFromViewBox();
+    };
+    const dragElem = document.querySelector("#overview_window_view_box");
+    const parentElem = document.querySelector("#overviewMiniView");
+    dragmove(dragElem, dragElem, parentElem, onStart, onEnd, onDrag);
+
     $('#overviewMiniView').click(function (evt) {
       // Firefox doesn't support evt.offsetX and evt.offsetY.
       const mouseX = (evt.offsetX || evt.originalEvent.layerX);
diff --git a/src/editor/jquery-ui/dragmove.js b/src/editor/jquery-ui/dragmove.js
new file mode 100644
index 000000000..47c7ca482
--- /dev/null
+++ b/src/editor/jquery-ui/dragmove.js
@@ -0,0 +1,96 @@
+// https://github.com/knadh/dragmove.js
+// Kailash Nadh (c) 2020.
+// MIT License.
+
+let _loaded = false;
+let _callbacks = [];
+const _isTouch = window.ontouchstart !== undefined;
+
+export const dragmove = function(target, handler, parent, onStart, onEnd, onDrag) {
+  // Register a global event to capture mouse moves (once).
+  if (!_loaded) {
+    document.addEventListener(_isTouch ? "touchmove" : "mousemove", function(e) {
+      let c = e;
+      if (e.touches) {
+        c = e.touches[0];
+      }
+
+      // On mouse move, dispatch the coords to all registered callbacks.
+      for (var i = 0; i < _callbacks.length; i++) {
+        _callbacks[i](c.clientX, c.clientY);
+      }
+    });
+  }
+
+  _loaded = true;
+  let isMoving = false, hasStarted = false;
+  let startX = 0, startY = 0, lastX = 0, lastY = 0;
+
+  // On the first click and hold, record the offset of the pointer in relation
+  // to the point of click inside the element.
+  handler.addEventListener(_isTouch ? "touchstart" : "mousedown", function(e) {
+    e.stopPropagation();
+    e.preventDefault();
+    if (target.dataset.dragEnabled === "false") {
+      return;
+    }
+
+    let c = e;
+    if (e.touches) {
+      c = e.touches[0];
+    }
+
+    isMoving = true;
+    startX = target.offsetLeft - c.clientX;
+    startY = target.offsetTop - c.clientY;
+  });
+
+  // On leaving click, stop moving.
+  document.addEventListener(_isTouch ? "touchend" : "mouseup", function(e) {   
+    if (onEnd && hasStarted) {
+      onEnd(target, parent, parseInt(target.style.left), parseInt(target.style.top));
+    }
+
+    isMoving = false;
+    hasStarted = false;
+  });
+
+  // On leaving click, stop moving.
+  document.addEventListener(_isTouch ? "touchmove" : "mousemove", function(e) {   
+    if (onDrag && hasStarted) {
+      onDrag(target, parseInt(target.style.left), parseInt(target.style.top));
+    }
+  });  
+
+  // Register mouse-move callback to move the element.
+  _callbacks.push(function move(x, y) {
+    if (!isMoving) {
+      return;
+    }
+
+    if (!hasStarted) {
+      hasStarted = true;
+      if (onStart) {
+        onStart(target, lastX, lastY);
+      }
+    }
+
+    lastX = x + startX;
+    lastY = y + startY;
+
+    // If boundary checking is on, don't let the element cross the viewport.
+    if (target.dataset.dragBoundary === "true") {
+      if (lastX < 1 || lastX >= window.innerWidth - target.offsetWidth) {
+        return;
+      }
+      if (lastY < 1 || lastY >= window.innerHeight - target.offsetHeight) {
+        return;
+      }
+    }
+
+    target.style.left = lastX + "px";
+    target.style.top = lastY + "px";
+  });
+}
+
+export { dragmove as default };
\ No newline at end of file