diff --git a/imageeditor_imagefield/js/imageeditor_imagefield.js b/imageeditor_imagefield/js/imageeditor_imagefield.js
index f6459c8..5bfc8a6 100644
--- a/imageeditor_imagefield/js/imageeditor_imagefield.js
+++ b/imageeditor_imagefield/js/imageeditor_imagefield.js
@@ -10,6 +10,10 @@
       $.each(this.items, function(index, value) {
         var $removebutton, $createimage, $imagewidget, options;
         $removebutton = $('input[id^="' + value.remove_button_id + '"]', context);
+        // Drupal >= 7.36 fix, see https://www.drupal.org/node/1734716
+        if ($removebutton.size() == 0){
+          $removebutton = $('input[id^="'+value.slice(0, -7)+'-remove-button"]', context);
+        }
         $createimage = $('a#' + value.element_id + '-imageeditor-source', context);
         if ($removebutton.length && !$removebutton.hasClass('imageeditor-imagefield-processed')) {
           $removebutton.addClass('imageeditor-imagefield-processed');