diff --git a/admin/themes/default/js/album_selector.js b/admin/themes/default/js/album_selector.js
new file mode 100644
index 000000000..983faa79e
--- /dev/null
+++ b/admin/themes/default/js/album_selector.js
@@ -0,0 +1,53 @@
+function set_up_popin() {
+  $(".ClosePopIn").on('click', function () {
+    linked_albums_close();
+  });
+}
+
+function linked_albums_close() {
+  $("#addLinkedAlbum").fadeOut();
+}
+
+function linked_albums_open() {
+  $("#addLinkedAlbum").fadeIn();
+  $(".search-input").val("");
+  $(".search-input").focus();
+  $("#searchResult").empty();
+  $(".limitReached").html(str_no_search_in_progress);
+}
+
+function linked_albums_search(searchText) {
+  $(".linkedAlbumPopInContainer .searching").show();
+  $.ajax({
+    url: "ws.php?format=json&method=pwg.categories.getAdminList",
+    type: "POST",
+    dataType: "json",
+    data : {
+      search: searchText,
+      additional_output: "full_name_with_admin_links",
+    },
+    before: function () {
+      
+    },
+    success: function (raw_data) {
+      $(".linkedAlbumPopInContainer .searching").hide();
+
+      categories = raw_data.result.categories;
+      fill_results(categories);
+
+      if (raw_data.result.limit_reached) {
+        $(".limitReached").html(str_result_limit.replace("%d", categories.length));
+      } else {
+        if (categories.length == 1) {
+          $(".limitReached").html(str_album_found);
+        } else {
+          $(".limitReached").html(str_albums_found.replace("%d", categories.length));
+        }
+      }
+    },
+    error: function (e) {
+      $(".linkedAlbumPopInContainer .searching").hide();
+      console.log(e.message);
+    }
+  })
+}
\ No newline at end of file
diff --git a/admin/themes/default/js/cat_modify.js b/admin/themes/default/js/cat_modify.js
index d104f776e..60d996a77 100644
--- a/admin/themes/default/js/cat_modify.js
+++ b/admin/themes/default/js/cat_modify.js
@@ -352,7 +352,7 @@ jQuery(document).ready(function() {
       $("#linkedAlbumSearch .search-cancel-linked-album").hide();
     }
 
-    if ($(this).val().length > 2) {
+    if ($(this).val().length > 0) {
       linked_albums_search($(this).val());
     } else {
       $(".limitReached").html(str_no_search_in_progress);
@@ -473,57 +473,6 @@ function checkAlbumLock() {
 }
 
 // Parent album popin functions
-function set_up_popin() {
-  $(".ClosePopIn").on('click', function () {
-    linked_albums_close();
-  });
-}
-
-function linked_albums_close() {
-  $("#addLinkedAlbum").fadeOut();
-}
-function linked_albums_open() {
-  $("#addLinkedAlbum").fadeIn();
-  $(".search-input").val("");
-  $(".search-input").focus();
-  $("#searchResult").empty();
-  $(".limitReached").html(str_no_search_in_progress);
-}
-function linked_albums_search(searchText) {
-  $(".linkedAlbumPopInContainer .searching").show();
-  $.ajax({
-    url: "ws.php?format=json&method=pwg.categories.getAdminList",
-    type: "POST",
-    dataType: "json",
-    data : {
-      search: searchText,
-      additional_output: "full_name_with_admin_links",
-    },
-    before: function () {
-      
-    },
-    success: function (raw_data) {
-      $(".linkedAlbumPopInContainer .searching").hide();
-
-      categories = raw_data.result.categories;
-      fill_results(categories);
-
-      if (raw_data.result.limit_reached) {
-        $(".limitReached").html(str_result_limit.replace("%d", categories.length));
-      } else {
-        if (categories.length == 1) {
-          $(".limitReached").html(str_album_found);
-        } else {
-          $(".limitReached").html(str_albums_found.replace("%d", categories.length));
-        }
-      }
-    },
-    error: function (e) {
-      $(".linkedAlbumPopInContainer .searching").hide();
-      console.log(e.message);
-    }
-  })
-}
 
 function fill_results(cats) {
   $("#searchResult").empty();
diff --git a/admin/themes/default/js/picture_modify.js b/admin/themes/default/js/picture_modify.js
index 7f054a66e..38d200b67 100644
--- a/admin/themes/default/js/picture_modify.js
+++ b/admin/themes/default/js/picture_modify.js
@@ -34,58 +34,6 @@ $(document).ready(function () {
   })
 })
 
-function set_up_popin() {
-  $(".ClosePopIn").on('click', function () {
-    linked_albums_close();
-  });
-}
-
-function linked_albums_close() {
-  $("#addLinkedAlbum").fadeOut();
-}
-function linked_albums_open() {
-  $("#addLinkedAlbum").fadeIn();
-  $(".search-input").val("");
-  $(".search-input").focus();
-  $("#searchResult").empty();
-  $(".limitReached").html(str_no_search_in_progress);
-}
-function linked_albums_search(searchText) {
-  $(".linkedAlbumPopInContainer .searching").show();
-  $.ajax({
-    url: "ws.php?format=json&method=pwg.categories.getAdminList",
-    type: "POST",
-    dataType: "json",
-    data : {
-      search: searchText,
-      additional_output: "full_name_with_admin_links",
-    },
-    before: function () {
-      
-    },
-    success: function (raw_data) {
-      $(".linkedAlbumPopInContainer .searching").hide();
-
-      categories = raw_data.result.categories;
-      fill_results(categories);
-
-      if (raw_data.result.limit_reached) {
-        $(".limitReached").html(str_result_limit.replace("%d", categories.length));
-      } else {
-        if (categories.length == 1) {
-          $(".limitReached").html(str_album_found);
-        } else {
-          $(".limitReached").html(str_albums_found.replace("%d", categories.length));
-        }
-      }
-    },
-    error: function (e) {
-      $(".linkedAlbumPopInContainer .searching").hide();
-      console.log(e.message);
-    }
-  })
-}
-
 function fill_results(cats) {
   $("#searchResult").empty();
   cats.forEach(cat => {
diff --git a/admin/themes/default/template/include/album_selector.inc.tpl b/admin/themes/default/template/include/album_selector.inc.tpl
index 6b7c63ce4..45bec48ec 100644
--- a/admin/themes/default/template/include/album_selector.inc.tpl
+++ b/admin/themes/default/template/include/album_selector.inc.tpl
@@ -1,5 +1,6 @@
 {if empty($load_mode)}{$load_mode='footer'}{/if}
 {include file='include/colorbox.inc.tpl' load_mode=$load_mode}
+{combine_script id='albumSelector' load_mode=$load_mode path='admin/themes/default/js/album_selector.js'}
 
 <div id="addLinkedAlbum" class="linkedAlbumPopIn">
   <div class="linkedAlbumPopInContainer">