diff --git a/src/jquery.draggable.js b/src/jquery.draggable.js
index 0b59eb03aa..b448e7b0f4 100644
--- a/src/jquery.draggable.js
+++ b/src/jquery.draggable.js
@@ -105,7 +105,9 @@
 
         return {
             left: left,
-            top: top
+            top: top,
+            mouse_left: mouse_actual_pos.left,
+            mouse_top: mouse_actual_pos.top
         };
     };
 
@@ -116,28 +118,31 @@
         var scrollTop = $window.scrollTop();
         var min_window_y = scrollTop;
         var max_window_y = min_window_y + this.window_height;
-        var player_top_y = this.baseY + offset.top;
-        var player_bottom_y = player_top_y + this.player_height;
+
+        var mouse_down_zone = max_window_y - 10;
+        var mouse_up_zone = min_window_y + 10;
+
+        var abs_mouse_left = offset.mouse_left;
+        var abs_mouse_top = min_window_y + offset.mouse_top;
+
         var max_player_y = (this.doc_height - this.window_height +
             this.player_height);
 
-        if ( player_bottom_y > max_window_y) {
-            var diff = player_bottom_y - max_window_y;
-            nextScrollTop = scrollTop + diff;
+        if (abs_mouse_top >= mouse_down_zone) {
+            nextScrollTop = scrollTop + 10;
             if (nextScrollTop < max_player_y) {
                 $window.scrollTop(nextScrollTop);
-                this.scrollOffset = this.scrollOffset + diff;
-            };
-        }else if (player_top_y < min_window_y) {
+                this.scrollOffset = this.scrollOffset + 10;
+            }
+        };
 
-            var diff = min_window_y - player_top_y;
-            nextScrollTop = scrollTop - diff;
+        if (abs_mouse_top <= mouse_up_zone) {
+            nextScrollTop = scrollTop - 10;
             if (nextScrollTop > 0) {
                 $window.scrollTop(nextScrollTop);
-                this.scrollOffset = this.scrollOffset - diff;
-            };
-        }
-
+                this.scrollOffset = this.scrollOffset - 10;
+            }
+        };
     }