diff --git a/admin/cat_list.php b/admin/cat_list.php
index 383e4d7f4..baba5e2c9 100644
--- a/admin/cat_list.php
+++ b/admin/cat_list.php
@@ -273,6 +273,15 @@ SELECT DISTINCT category_id
 
 $template->assign('categories', array());
 $base_url = get_root_url().'admin.php?page=';
+
+if (isset($_GET['parent_id']))
+{
+  $template->assign(
+    'PARENT_EDIT',
+    $base_url.'album-'.$_GET['parent_id']
+    );
+}
+
 foreach ($categories as $category)
 {
   $cat_list_url = $base_url.'cat_list';
diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl
index 89989782d..8b173034c 100644
--- a/admin/themes/default/template/cat_list.tpl
+++ b/admin/themes/default/template/cat_list.tpl
@@ -60,6 +60,7 @@ jQuery(document).ready(function(){
 <p class="showCreateAlbum" id="notManualOrder">
   <a href="#" id="addAlbumOpen">{'create a new album'|@translate}</a>
   {if count($categories)}| <a href="#" id="autoOrderOpen">{'apply automatic sort order'|@translate}</a>{/if}
+  {if ($PARENT_EDIT)}| <a href="{$PARENT_EDIT}"></span>{'edit'|@translate}</a>{/if}
 </p>
 <form id="formCreateAlbum" action="{$F_ACTION}" method="post" style="display:none;">
   <fieldset>