diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f22d3b6111..dfff9c020cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ data source api change.
 # 2.1.x (currently unreleased patch branch)
 
 **Fixes**
+- [Issue #2558](https://github.com/grafana/grafana/issues/2558). DragDrop: Fix for broken drag drop behavior
 - [Issue #2534](https://github.com/grafana/grafana/issues/2534). Templating: fix for setting template variable value via url and having repeated panels or rows
 
 # 2.1.1 (2015-08-11)
diff --git a/bower.json b/bower.json
index ed574b93c98..88cb0b3df4a 100644
--- a/bower.json
+++ b/bower.json
@@ -18,7 +18,7 @@
     "angular-route": "~1.4.3",
     "angular-mocks": "~1.4.3",
     "angular-sanitize": "~1.4.3",
-    "angular-native-dragdrop": "~1.1.0",
+    "angular-native-dragdrop": "~1.1.1",
     "angular-bindonce": "~0.3.3",
     "requirejs": "~2.1.18",
     "requirejs-text": "~2.0.14"
diff --git a/public/vendor/angular-native-dragdrop/.bower.json b/public/vendor/angular-native-dragdrop/.bower.json
index 79dabd89c29..6cef5b66f76 100644
--- a/public/vendor/angular-native-dragdrop/.bower.json
+++ b/public/vendor/angular-native-dragdrop/.bower.json
@@ -31,6 +31,6 @@
     "commit": "4ff89cb0aa61070508e935729fb816fd46a58f60"
   },
   "_source": "git://github.com/angular-dragdrop/angular-dragdrop.git",
-  "_target": "~1.1.0",
+  "_target": "~1.1.1",
   "_originalSource": "angular-native-dragdrop"
 }
\ No newline at end of file
diff --git a/public/vendor/angular-native-dragdrop/draganddrop.js b/public/vendor/angular-native-dragdrop/draganddrop.js
index 63eb5d78c55..5aa417ad2e6 100755
--- a/public/vendor/angular-native-dragdrop/draganddrop.js
+++ b/public/vendor/angular-native-dragdrop/draganddrop.js
@@ -7,7 +7,7 @@
 
     function determineEffectAllowed(e) {
         // Chrome doesn't set dropEffect, so we have to work it out ourselves
-        if (e.dataTransfer.dropEffect === 'none') {
+        if (e.dataTransfer && e.dataTransfer.dropEffect === 'none') {
             if (e.dataTransfer.effectAllowed === 'copy' ||
                 e.dataTransfer.effectAllowed === 'move') {
                 e.dataTransfer.dropEffect = e.dataTransfer.effectAllowed;