diff --git a/templates/2k11/admin/entries.tpl b/templates/2k11/admin/entries.tpl
index 97498a85..a993e96c 100644
--- a/templates/2k11/admin/entries.tpl
+++ b/templates/2k11/admin/entries.tpl
@@ -107,6 +107,9 @@
         {$entry_vars.entry|@serendipity_refhookPlugin:'backend_display'}
     </fieldset>
 </form>
+{if ! $use_popup}
+    <script src="{serendipity_getFile file='admin/js/jquery.magnific-popup.js'}"></script>
+{/if}
 {if $entry_vars.wysiwyg}
     {foreach from=$entry_vars.wysiwyg_blocks item="wysiwyg_block_item" key="wysiwyg_block_jsname"}
         {$wysiwyg_block_item|emit_htmlarea_code:$wysiwyg_block_jsname}
diff --git a/templates/2k11/admin/serendipity_editor.js.tpl b/templates/2k11/admin/serendipity_editor.js.tpl
index 597ddac7..9aa40911 100644
--- a/templates/2k11/admin/serendipity_editor.js.tpl
+++ b/templates/2k11/admin/serendipity_editor.js.tpl
@@ -732,7 +732,18 @@ var AccessifyHTML5 = function (defaults, more_fixes) {
     });
 
     $('.wrap_insmedia').click(function() {
-        window.open('serendipity_admin_image_selector.php?serendipity[textarea]=' + $(this).attr('data-tarea'), 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
+        {if $use_popups}
+            window.open('serendipity_admin_image_selector.php?serendipity[textarea]=' + $(this).attr('data-tarea'),
+                        'ImageSel',
+                        'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
+        {else}
+            $.magnificPopup.open({
+              items: {
+                src: 'serendipity_admin_image_selector.php?serendipity[textarea]=' + $(this).attr('data-tarea')
+              },
+              type: 'iframe'
+            });
+        {/if}
     });
 
     // Entry preview
diff --git a/templates/2k11/admin/wysiwyg_init.tpl b/templates/2k11/admin/wysiwyg_init.tpl
index 4d5b48f5..7b380925 100644
--- a/templates/2k11/admin/wysiwyg_init.tpl
+++ b/templates/2k11/admin/wysiwyg_init.tpl
@@ -1,8 +1,5 @@
 {if $init}
     <script src="{$serendipityHTTPPath}htmlarea/ckeditor/ckeditor.js"></script>
-    {if ! $use_popup}
-        <script src="{serendipity_getFile file='admin/js/jquery.magnific-popup.js'}"></script>
-    {/if}
 {/if}
 <script>
     $('document').ready(function() {