diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php
index 34605d96..2622c820 100644
--- a/include/admin/images.inc.php
+++ b/include/admin/images.inc.php
@@ -675,6 +675,7 @@ switch ($serendipity['GET']['adminAction']) {
         return;
 
     default:
+        serendipity_restoreVar($serendipity['COOKIE']['serendipity_only_path'], $serendipity['GET']['only_path']);
         $data['case_default'] = true;
         $data['showML'] = showMediaLibrary();
         break;
diff --git a/templates/2k11/admin/serendipity_editor.js.tpl b/templates/2k11/admin/serendipity_editor.js.tpl
index 2296fa0a..04c29945 100644
--- a/templates/2k11/admin/serendipity_editor.js.tpl
+++ b/templates/2k11/admin/serendipity_editor.js.tpl
@@ -1489,15 +1489,8 @@ $(function() {
     {/if}
 
     if ($('#serendipity_only_path').length > 0) {
-        if ($('#serendipity_only_path').val() != localStorage.getItem('serendipity_only_path')) {
-            var only_path = localStorage.getItem('serendipity_only_path');
-            if(only_path != null) {
-                $('#serendipity_only_path').val(only_path);
-                $('#media_library_control').submit();
-            }
-        }
         $('#serendipity_only_path').change(function() {
-            localStorage.setItem('serendipity_only_path', $('#serendipity_only_path').val());
+            serendipity.SetCookie('serendipity_only_path', $('#serendipity_only_path').val());
         });
     }