--- plugins/wysiwyg_imagefield/wysiwyg_imagefield.js.orig	2010-10-15 12:41:05.000000000 +0200
+++ plugins/wysiwyg_imagefield/wysiwyg_imagefield.js	2010-10-15 12:40:16.000000000 +0200
@@ -18,8 +18,8 @@
      */
     invoke: function(data, settings, instanceId) {
       $('#wysiwyg_imagefield-wrapper').css('display', 'block').dialog('open');
-      Drupal.wysiwygImageField.focus();
-      Drupal.wysiwygImageField.setPosition();
+      Drupal.wysiwygImageField.focus(instanceId);
+      Drupal.wysiwygImageField.setPosition(instanceId);
       $($('#wysiwyg_imagefield-wrapper').children().get(0)).css('display', 'none');
       if ($('#wysiwyg_imagefield-wrapper').children().length == 1) {
         $('#wysiwyg_imagefield-wrapper table .filefield-element:last').parent().parent().appendTo($('#wysiwyg_imagefield-wrapper'));
@@ -35,7 +35,7 @@
         height: 'inherit',
         title: Drupal.t('WYSIWYG ImageField')
       });
-      Drupal.wysiwygImageField.init();
+      Drupal.wysiwygImageField.init(instanceId);
       return content;
     },
 
@@ -48,26 +48,26 @@
   };
 
   Drupal.wysiwygImageField = {
-    init: function() {
+    init: function(instanceId) {
       $('#wysiwyg_imagefield-wrapper').parents('.ui-dialog').attr('id', 'wysiwyg_imagefield-dialog');
 
       // Move dialog back inside form.
       $('#wysiwyg_imagefield-dialog').bind('focus', function() {
-        Drupal.wysiwygImageField.focus();
+        Drupal.wysiwygImageField.focus(instanceId);
       });
     },
 
-    focus: function() {
-      if ($('#wysiwyg_imagefield-dialog').parent() !== $('#' + Drupal.wysiwyg.activeId + '-wrapper')) {
-        $('#wysiwyg_imagefield-dialog').prependTo($('#' + Drupal.wysiwyg.activeId + '-wrapper'));
+    focus: function(instanceId) {
+      if ($('#wysiwyg_imagefield-dialog').parent() !== $('#' + instanceId + '-wrapper')) {
+        $('#wysiwyg_imagefield-dialog').prependTo($('#' + instanceId + '-wrapper'));
       }
     },
 
-    getId: function() {
+    getId: function(instanceId) {
       // Use tallest field as target.
       height = 0;
       id = null;
-      $('#' + Drupal.wysiwyg.activeId + '-wrapper').children().each(function() {
+      $('#' + instanceId + '-wrapper').children().each(function() {
         if ($(this).css('display') !== 'none' && $(this).height() > height && $(this).attr('id') != 'wysiwyg_imagefield-dialog')  {
           height = $(this).height();
           if (!$(this).attr('id')) {
@@ -79,8 +79,8 @@
       return id;
     },
 
-    setPosition: function() {
-      id = Drupal.wysiwygImageField.getId();
+    setPosition: function(instanceId) {
+      id = Drupal.wysiwygImageField.getId(instanceId);
 
       // Position dialog.
       $('#wysiwyg_imagefield-dialog').css({