diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index 0f9b113a4aa..956a0d02466 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -309,7 +309,7 @@ $.widget("ui.sortable", $.ui.mouse, {
 
 		//Do scrolling
 		if(this.options.scroll) {
-			if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") {
+			if((this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") && (this.scrollParent[0].offsetHeight < $(window).height())) {
 
 				if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
 					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;