diff --git a/popup.js b/popup.js
index a9f8fca..a5d0527 100644
--- a/popup.js
+++ b/popup.js
@@ -393,7 +393,7 @@ function dragElement(draggable, header) {
         
         var popup=this;
         
-        $(header).on('mousedown', function (e) {
+        $(popup).find(header).on('mousedown', {draggable: this}, function (e) {
         
             e = e || window.event;
             
@@ -402,16 +402,17 @@ function dragElement(draggable, header) {
             pos3 = e.clientX;
             pos4 = e.clientY;
             
-            document.onmouseup = closeDragElement;
+            document.onmouseup = e.data.draggable.closeDragElement;
             
             // call a function whenever the cursor moves:
-            document.onmousemove = elementDrag;
+            document.onmousemove = e.data.draggable.elementDrag;
         
             console.log('Moving... ');
         
         });
         
-        function elementDrag(e) {
+        //function elementDrag(e) {
+        this.elementDrag=function (e) {
             
             console.log('Moving windows...');
             
@@ -436,7 +437,8 @@ function dragElement(draggable, header) {
             
         }
         
-        function closeDragElement() {
+        //function closeDragElement() {
+        this.closeDragElement=function (e) {
         // stop moving when mouse button is released:
             document.onmouseup = null;
             document.onmousemove = null;