diff --git a/deployment/serendipity_editor.js b/deployment/serendipity_editor.js
index bb36cafe..acac0b2b 100644
--- a/deployment/serendipity_editor.js
+++ b/deployment/serendipity_editor.js
@@ -268,7 +268,7 @@ function serendipity_imageSelector_done(textarea)
         } else if (targetval == '_blank') {
             itarget = ' target="_blank"';
         } else if (targetval == 'plugin') {
-            itarget = ' id="s9yisphref' + imgID + '"';
+            itarget = ' id="s9yisphref' + imgID + '" onclick="javascript:this.href = this.href + \'&serendipity[from]=\' + self.location.href;"';
             prepend = '<a title="' + ilink + '" id="s9yisp' + imgID + '"></a>';
             ilink   = baseURL + 'serendipity_admin_image_selector.php?serendipity[step]=showItem&amp;serendipity[image]=' + imgID;
         }
@@ -288,10 +288,11 @@ function serendipity_imageSelector_done(textarea)
         block = insert;
     }
 
-    if (parent.self.opener.editorref) {
+    if (typeof(parent.self.opener.htmlarea_editors) != 'undefined' && typeof(parent.self.opener.htmlarea_editors[textarea] != 'undefined')) {
+        parent.self.opener.htmlarea_editors[textarea].surroundHTML(block, '');
+    } else if (parent.self.opener.editorref) {
         parent.self.opener.editorref.surroundHTML(block, '');
     } else {
-
         parent.self.opener.serendipity_imageSelector_addToBody(block, textarea);
     }
 
diff --git a/docs/NEWS b/docs/NEWS
index b87a6cdc..8089099d 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -243,6 +243,10 @@ Version 1.1-alpha5()
 Version 1.0.1 ()
 ------------------------------------------------------------------------
 
+   * Fix problem on newer Firefox versions, where insertion of images
+     in the WYSIWYG editor did not work. It might be necessary to
+     purge your browsers cache for this to properly work. (Jay Bertrandt)
+
    * Fix utf8 iconv conversion failing on some older PHP setups.
      Thanks to Matthias Leisi!
 
diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php
index 65db1ca4..51e56fa7 100644
--- a/include/admin/images.inc.php
+++ b/include/admin/images.inc.php
@@ -515,6 +515,7 @@ switch ($serendipity['GET']['adminAction']) {
             NULL,
             'write'
         );
+        usort($folders, 'serendipity_sortPath');
 ?>
     <div class="image_directory_create"><strong><?php echo CREATE_DIRECTORY ?></strong></div>
     <div class="image_directory_create_desc"><?php echo CREATE_DIRECTORY_DESC ?></div>
@@ -557,7 +558,7 @@ switch ($serendipity['GET']['adminAction']) {
             NULL,
             'write'
         );
-
+        usort($folders, 'serendipity_sortPath');
 ?>
     <div class="image_directory_list"><?php echo DIRECTORIES_AVAILABLE; ?></div>
     <br />
@@ -594,6 +595,7 @@ switch ($serendipity['GET']['adminAction']) {
             NULL,
             'write'
         );
+        usort($folders, 'serendipity_sortPath');
 
         $form_hidden = '';
         if (isset($image_selector_addvars) && is_array($image_selector_addvars)) {
diff --git a/include/functions_entries_admin.inc.php b/include/functions_entries_admin.inc.php
index b47438f1..5927e062 100644
--- a/include/functions_entries_admin.inc.php
+++ b/include/functions_entries_admin.inc.php
@@ -532,7 +532,7 @@ function serendipity_emit_htmlarea_code($item, $jsname, $spawnMulti = false) {
         config<?php echo $jsname; ?>    = editor<?php echo $jsname; ?>.config;
         config<?php echo $jsname; ?>.registerButton('image_selector', '<?PHP echo MANAGE_IMAGES; ?>', '<?php echo $serendipity['serendipityHTTPPath']; ?>htmlarea/images/ed_s9yimage.gif', false,
             function(editor, id) {
-                window.open('<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_admin_image_selector.php?serendipity[textarea]=<?php echo $jsname; ?>', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
+                window.open('<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_admin_image_selector.php?serendipity[textarea]=<?php echo $jsname . ($spawnMulti ? "' + editor._textArea.id + '" : ''); ?>', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
                 editorref = editor<?php echo $jsname; ?>;
             }
         );
diff --git a/serendipity_editor.js b/serendipity_editor.js
index 7e9bdc44..acac0b2b 100644
--- a/serendipity_editor.js
+++ b/serendipity_editor.js
@@ -288,10 +288,11 @@ function serendipity_imageSelector_done(textarea)
         block = insert;
     }
 
-    if (parent.self.opener.editorref) {
+    if (typeof(parent.self.opener.htmlarea_editors) != 'undefined' && typeof(parent.self.opener.htmlarea_editors[textarea] != 'undefined')) {
+        parent.self.opener.htmlarea_editors[textarea].surroundHTML(block, '');
+    } else if (parent.self.opener.editorref) {
         parent.self.opener.editorref.surroundHTML(block, '');
     } else {
-
         parent.self.opener.serendipity_imageSelector_addToBody(block, textarea);
     }