diff --git a/admin/albums.php b/admin/albums.php
index cafcbdd85..ba934b6d5 100644
--- a/admin/albums.php
+++ b/admin/albums.php
@@ -25,6 +25,8 @@ list($albums_counter) = pwg_db_fetch_row(pwg_query($query));
 // +-----------------------------------------------------------------------+
 check_status(ACCESS_ADMINISTRATOR);
 
+check_input_parameter('parent_id', $_GET, false, PATTERN_ID);
+
 // +-----------------------------------------------------------------------+
 // | tabs                                                                  |
 // +-----------------------------------------------------------------------+
@@ -36,7 +38,7 @@ include(PHPWG_ROOT_PATH.'admin/include/albums_tab.inc.php');
 // |                         categories auto order                         |
 // +-----------------------------------------------------------------------+
 
-$open_cat = -1;
+$open_cat = $_GET['parent_id'] ?? -1;
 
 $sort_orders = array(
   'name ASC',
diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index eacadbce6..8fe25a4f4 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -198,7 +198,7 @@ $template->assign(
 
     'U_ADD_PHOTOS_ALBUM' => $base_url.'photos_add&album='.$category['id'],
     'U_CHILDREN' => $cat_list_url.'&parent_id='.$category['id'],
-    'U_MOVE' => $base_url.'albums&parent_id='.$category['id'].'#cat-'.$category['id'],
+    'U_MOVE' => $base_url.'albums&parent_id='.$category['id'],
     )
   );
  
diff --git a/admin/themes/default/js/albums.js b/admin/themes/default/js/albums.js
index bd18e378a..f33be4589 100644
--- a/admin/themes/default/js/albums.js
+++ b/admin/themes/default/js/albums.js
@@ -13,18 +13,6 @@ $(document).ready(() => {
     onCanSelectNode: function(node) {return false}
   });
 
-  var url_split = window.location.href.split("cat_move");
-  var catToOpen = url_split[url_split.length-1].split("-")[1];
-
-  if(catToOpen && isNumeric(catToOpen)) {
-    nodeToGo = $('.tree').tree('getNodeById', catToOpen);
-
-    goToNode(nodeToGo, nodeToGo);
-    if (nodeToGo.children) {
-      $(".tree").tree("openNode", nodeToGo, false);
-    }
-  }
-
   $('.tree').on( 'click', '.move-cat-toogler', function(e) {
     var node_id = $(this).attr('data-id');
     var node = $('.tree').tree('getNodeById', node_id);
@@ -121,8 +109,13 @@ $(document).ready(() => {
   });
 
   if (openCat != -1) {
-    var node = $('.tree').tree('getNodeById', openCat);
-    $('.tree').tree('openNode', node);
+    nodeToGo = $('.tree').tree('getNodeById', openCat);
+
+    goToNode(nodeToGo, nodeToGo);
+    if (nodeToGo.children) {
+      $(".tree").tree("openNode", nodeToGo, false);
+    }
+
     $([document.documentElement, document.body]).animate({
       scrollTop: $("#cat-"+openCat).offset().top
     }, 500);