diff --git a/ui/draggable.js b/ui/draggable.js
index b59955add55..cfff64cdd3b 100644
--- a/ui/draggable.js
+++ b/ui/draggable.js
@@ -84,6 +84,8 @@ $.widget("ui.draggable", $.ui.mouse, {
 	},
 
 	_destroy: function() {
+		var ddmanager = $.ui.ddmanager;
+
 		if ( ( this.helper || this.element ).is( ".ui-draggable-dragging" ) ) {
 			this.destroyOnClear = true;
 			return;
@@ -91,6 +93,9 @@ $.widget("ui.draggable", $.ui.mouse, {
 		this.element.removeClass( "ui-draggable ui-draggable-dragging ui-draggable-disabled" );
 		this._removeHandleClassName();
 		this._mouseDestroy();
+        if ( ddmanager && ddmanager.current === this ) {
+            ddmanager.current = null;
+        }
 	},
 
 	_mouseCapture: function(event) {