diff --git dragndrop_uploads.js dragndrop_uploads.js
index 0f6a820..23208ca 100755
--- dragndrop_uploads.js
+++ dragndrop_uploads.js
@@ -1,6 +1,7 @@
+// $Id: dragndrop_uploads.js,v 1.12 2009/12/11 06:32:53 deciphered Exp $
 
 (function($) {
-  $(document).ready(function() {
+  $(document).ready(function() {
     // Hide upload Widget.
     if (Drupal.settings.dragNDropUploads.hide == true) {
       $(Drupal.settings.dragNDropUploads.dropzones['default'].wrapper).hide();
@@ -13,12 +14,14 @@
         Drupal.dragNDropUploads.wysiwygAttachDropzones(this.field);
         // Send null data for TinyMCE & Safari/Chrome issue.
         if (Drupal.wysiwyg.instances[this.field].editor == 'tinymce') {
-          Drupal.wysiwyg.instances[this.field].insert('');
+            if(tinyMCE.activeEditor != null){
+              Drupal.wysiwyg.instances[this.field].insert('');
+            }
         }
       });
     }
   });
-
+
   Drupal.dragNDropUploads = {
     // Standard dropzone attachment function.
     attachDropzone: function(dropzone) {
@@ -85,7 +88,7 @@
         //  break;
         // WYMEditor support.
         case 'wymeditor':
-          dropzone.iframe = $('#' + field + '-wrapper .wym_iframe IFRAME');
+          dropzone.iframe = $('.wym_iframe IFRAME');
           dropzone.selector = dropzone.iframe.get(0).contentDocument;
           break;
         // YUI editor support.
