diff --git a/admin/albums.php b/admin/albums.php
index d7234517b..530fba7b2 100644
--- a/admin/albums.php
+++ b/admin/albums.php
@@ -18,6 +18,13 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 // +-----------------------------------------------------------------------+
 check_status(ACCESS_ADMINISTRATOR);
 
+// +-----------------------------------------------------------------------+
+// | tabs                                                                  |
+// +-----------------------------------------------------------------------+
+
+$page['tab'] = 'list';
+include(PHPWG_ROOT_PATH.'admin/include/albums_tab.inc.php');
+
 // +-----------------------------------------------------------------------+
 // |                         categories auto order                         |
 // +-----------------------------------------------------------------------+
diff --git a/admin/include/add_core_tabs.inc.php b/admin/include/add_core_tabs.inc.php
index 89891b2a6..bdb7c6f6d 100644
--- a/admin/include/add_core_tabs.inc.php
+++ b/admin/include/add_core_tabs.inc.php
@@ -31,7 +31,7 @@ function add_core_tabs($sheets, $tab_id)
 
     case 'albums':
       global $my_base_url;
-      $sheets['list'] = array('caption' => '<span class="icon-menu"></span>'.l10n('List'), 'url' => $my_base_url.'cat_list');
+      $sheets['list'] = array('caption' => '<span class="icon-menu"></span>'.l10n('List'), 'url' => $my_base_url.'albums');
       $sheets['permalinks'] = array('caption' => '<span class="icon-link-1"></span>'.l10n('Permalinks'), 'url' => $my_base_url.'permalinks');
       $sheets['search'] = array('caption' => '<span class="icon-search"></span>'.l10n('Search'), 'url' => $my_base_url.'cat_search');
       break;
diff --git a/admin/themes/default/js/albums.js b/admin/themes/default/js/albums.js
index ace889356..f83feb851 100644
--- a/admin/themes/default/js/albums.js
+++ b/admin/themes/default/js/albums.js
@@ -1,7 +1,6 @@
 $(document).ready(() => {
 
   formatedData = data;
-  // $(".albumsFilter .search-input").val('');
 
   $('.tree').tree({
     data: formatedData,
@@ -114,7 +113,12 @@ $(document).ready(() => {
   }
 
   if(catToOpen && isNumeric(catToOpen)) {
-    goToNode($('.tree').tree('getNodeById', catToOpen), $('.tree').tree('getNodeById', 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) {
diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
index 60ee8489e..ccaf64e87 100644
--- a/admin/themes/default/template/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -72,8 +72,7 @@ jQuery(document).ready(function() {
 		<dt><i class="icon-sitemap"> </i><span>{'Albums'|@translate}&nbsp;</span><i class="icon-down-open open-menu"></i></dt>
     <dd>
       <ul>
-        <li><a href="{$U_CATEGORIES}"><i class="icon-folder-open"></i>{'Manage'|@translate}</a></li>
-        <li><a href="{$U_ALBUMS}"><i class="icon-move"></i>{'Move'|@translate}</a></li>
+        <li><a href="{$U_ALBUMS}"><i class="icon-folder-open"></i>{'Manage'|@translate}</a></li>
         <li><a href="{$U_CAT_OPTIONS}"><i class="icon-pencil"></i>{'Properties'|@translate}</a></li>
       </ul>
     </dd>
diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index ba986f7bf..6a684cc82 100644
--- a/admin/themes/default/template/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
@@ -300,16 +300,12 @@ function cropImage() {
 
         <a class="icon-plus-circled" href="{$U_ADD_PHOTOS_ALBUM}">{'Add Photos'|translate}</a>
 
-        <a class="icon-sitemap" href="{$U_CHILDREN}">{'Manage sub-albums'|@translate}</a>
+        <a class="icon-sitemap" href="{$U_MOVE}">{'Manage sub-albums'|@translate}</a>
 
       {if isset($U_SYNC) }
         <a class="icon-exchange" href="{$U_SYNC}">{'Synchronize'|@translate}</a>
       {/if}
 
-      {if isset($U_MOVE) }
-        <a class="icon-move moveAlbum" href="{$U_MOVE}">{'Move'|@translate}</a>
-      {/if} 
-
       {if isset($U_DELETE) }
         <a class="icon-trash deleteAlbum" href="#">{'Delete album'|@translate}</a>
       {/if} 
diff --git a/admin/themes/default/template/intro.tpl b/admin/themes/default/template/intro.tpl
index a82300a71..07404025b 100644
--- a/admin/themes/default/template/intro.tpl
+++ b/admin/themes/default/template/intro.tpl
@@ -111,7 +111,7 @@ let str_size = "";
 {/if}
 
 {if $NB_ALBUMS > 1}
-<a class="stat-box" href="{$U_CATEGORIES}">
+<a class="stat-box" href="{$U_ALBUMS}">
 <i class="icon-sitemap icon-red"></i>
 <span class="number">{$NB_ALBUMS}</span><span class="caption">{'Albums'|translate}</span>
 </a>