diff --git a/docs/NEWS b/docs/NEWS
index 6fd1f066..a41919d9 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -4,6 +4,8 @@
 Version 2.0-beta3 ()
 ------------------------------------------------------------------------
 
+    * Remember selected media library folder
+
     * Show upload-success or error with the ajax image uploader
 
     * Fix preview entry exception (issue #119)
diff --git a/templates/2k11/admin/serendipity_editor.js.tpl b/templates/2k11/admin/serendipity_editor.js.tpl
index 6a35e43c..56a9c925 100644
--- a/templates/2k11/admin/serendipity_editor.js.tpl
+++ b/templates/2k11/admin/serendipity_editor.js.tpl
@@ -1399,6 +1399,16 @@ $(function() {
         }
     {/if}
 
+    if ($('#serendipity_only_path').length > 0) {
+        if ($('#serendipity_only_path').val() != localStorage.getItem('serendipity_only_path')) {
+            $('#serendipity_only_path').val(localStorage.getItem('serendipity_only_path'));
+            $('#media_library_control').submit();
+        }
+        $('#serendipity_only_path').change(function() {
+            localStorage.setItem('serendipity_only_path', $('#serendipity_only_path').val());
+        });
+    }
+
     // reopen detail element after spamblock action
     if ($('#serendipity_comments_list').length > 0 && window.location.hash && $('#' + window.location.hash.replace('#', '')).length > 0) {
         $('#' + window.location.hash.replace('#', '')).find(".toggle_info").click();