diff --git a/lib/features/dragging/HoverFix.js b/lib/features/dragging/HoverFix.js
index e644ab483..a944bdd58 100644
--- a/lib/features/dragging/HoverFix.js
+++ b/lib/features/dragging/HoverFix.js
@@ -24,7 +24,7 @@ var HIGH_PRIORITY = 1500;
  * @param {Dragging} dragging
  * @param {ElementRegistry} elementRegistry
  */
-export default function HoverFix(eventBus, dragging, elementRegistry) {
+export default function HoverFix(canvas, eventBus, dragging, elementRegistry) {
 
   var self = this;
 
@@ -77,6 +77,16 @@ export default function HoverFix(eventBus, dragging, elementRegistry) {
 
   });
 
+  /**
+   * We make sure that dropping an element forces the element
+   * we're hovering over to lose the hover class.
+   */
+  eventBus.on('drag.end', function(event) {
+
+    canvas.removeMarker(event.hoverGfx, 'hover');
+
+  });
+
 
   /**
    * We make sure that drag.out is always fired, even if the
@@ -152,6 +162,7 @@ export default function HoverFix(eventBus, dragging, elementRegistry) {
 }
 
 HoverFix.$inject = [
+  'canvas',
   'eventBus',
   'dragging',
   'elementRegistry'