diff --git a/internal_packages/composer/lib/contenteditable-component.cjsx b/internal_packages/composer/lib/contenteditable-component.cjsx
index 6277a5eb4..62989b5d4 100644
--- a/internal_packages/composer/lib/contenteditable-component.cjsx
+++ b/internal_packages/composer/lib/contenteditable-component.cjsx
@@ -448,13 +448,11 @@ class ContenteditableComponent extends React.Component
     else return false
 
   _onBlur: (event) =>
-    # console.log "On Blur Contenteditable"
     @setInnerState dragging: false
     # The delay here is necessary to see if the blur was caused by us
     # navigating to the toolbar and focusing on the set-url input.
-    _.delay =>
-      @setInnerState editableFocused: false
-    , 50
+    return if @_editableNode().parentElement.contains event.relatedTarget
+    @setInnerState editableFocused: false
 
   _onFocus: (event) =>
     @setInnerState editableFocused: true