diff --git a/lang/addlang.txt b/lang/addlang.txt
index d56113f9..5e12ef79 100644
--- a/lang/addlang.txt
+++ b/lang/addlang.txt
@@ -1 +1,2 @@
 @define('URL_NOT_FOUND', 'The requested page could not be found (404). This is the default page.');
+@define('INSERT_ALL, 'Insert All');
diff --git a/templates/2k11/admin/entries.tpl b/templates/2k11/admin/entries.tpl
index 3db8f9bf..6c6a323d 100644
--- a/templates/2k11/admin/entries.tpl
+++ b/templates/2k11/admin/entries.tpl
@@ -170,4 +170,4 @@
         {$wysiwyg_block_item|emit_htmlarea_code:$wysiwyg_block_jsname}
     {/foreach}
     {$entry_vars.wysiwyg_blocks|serendipity_refhookPlugin:'backend_wysiwyg_finish'}
-{/if}
+{/if}
\ No newline at end of file
diff --git a/templates/2k11/admin/media_items.tpl b/templates/2k11/admin/media_items.tpl
index bec0bbc9..41ec0f33 100644
--- a/templates/2k11/admin/media_items.tpl
+++ b/templates/2k11/admin/media_items.tpl
@@ -70,8 +70,10 @@
                     </div>
                     {else}
                         {if NOT $media.manage}
-                            <input id="multiinsert_image{$file.id}" class="multiinsert" name="serendipity[fids][]" type="checkbox" value="{$file.id}" data-multiinsertid="media_{$file.id}">
-                            <label for="multiinsert_image{$file.id}" class="visuallyhidden">{$CONST.TOGGLE_SELECT}</label>
+                            <div class="form_check">
+                                <input id="multiinsert_image{$file.id}" class="multiinsert" name="serendipity[fids][]" type="checkbox" value="{$file.id}" data-multidelid="media_{$file.id}">
+                                <label for="multiinsert_image{$file.id}" class="visuallyhidden">{$CONST.TOGGLE_SELECT}</label>
+                            </div>
                         {/if}
                     {/if}
 
diff --git a/templates/2k11/admin/media_pane.tpl b/templates/2k11/admin/media_pane.tpl
index 001b60f9..8b18300f 100644
--- a/templates/2k11/admin/media_pane.tpl
+++ b/templates/2k11/admin/media_pane.tpl
@@ -278,11 +278,8 @@
         </div>
     {else}
         {if NOT $media.manage}
-            <div class="form_buttons">                
-                {* javascript will add the chosen images as &amp;serendipity[fids]=x,y,z,... *}
-                {*<a href="{$link}" class="image_insert button_link">Insert All</a> *}
-                <button class="image_insert button_link" type="submit">Insert All</button>
-                </form>
+            <div id="media_galleryinsert" class="form_buttons">                
+                <button class="image_insert button_link" type="submit">{$CONST.INSERT_ALL}</button>
             </div>
         {/if}
     {/if}
diff --git a/templates/2k11/admin/serendipity_editor.js.tpl b/templates/2k11/admin/serendipity_editor.js.tpl
index f01dfbe2..b86e86bd 100644
--- a/templates/2k11/admin/serendipity_editor.js.tpl
+++ b/templates/2k11/admin/serendipity_editor.js.tpl
@@ -1384,10 +1384,13 @@ $(function() {
     });
 
     // Selection for multidelete
-    $('.multidelete').click(function() {
+    $('.multidelete, .multiinsert').click(function() {
         var $el = $(this);
         serendipity.highlightComment($el.attr('data-multidelid'), $el.attr('checked'));
+        $('#media_galleryinsert').fadeIn();
     });
+    // hide gallery insert button until an image is selected
+    $('#media_galleryinsert').hide();
 
     // Invert checkboxes
     $('.invert_selection').click(function() {