diff --git a/admin/include/add_core_tabs.inc.php b/admin/include/add_core_tabs.inc.php
index c6e2ac734..e9f4d9ff5 100644
--- a/admin/include/add_core_tabs.inc.php
+++ b/admin/include/add_core_tabs.inc.php
@@ -31,6 +31,11 @@ function add_core_tabs($sheets, $tab_id)
       $sheets[''] = array('caption' => l10n('Administration Home'), 'url' => 'admin.php');
       break;
 
+    case 'tags':
+      global $my_base_url;
+      $sheets[''] = array('caption' => '<span class="icon-tags"></span>'.l10n('Tags'), 'url' => $my_base_url.'tags');
+      break;
+
     case 'album':
       global $admin_album_base_url;
       $sheets['properties'] = array('caption' => '<span class="icon-pencil"></span>'.l10n('Properties'), 'url' => $admin_album_base_url.'-properties');
diff --git a/admin/tags.php b/admin/tags.php
index 991aeec26..0858d830f 100644
--- a/admin/tags.php
+++ b/admin/tags.php
@@ -34,6 +34,19 @@ if (!empty($_POST))
   check_pwg_token();
 }
 
+// +-----------------------------------------------------------------------+
+// | tabs                                                                  |
+// +-----------------------------------------------------------------------+
+
+include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
+
+$my_base_url = get_root_url().'admin.php?page=';
+
+$tabsheet = new tabsheet();
+$tabsheet->set_id('tags');
+$tabsheet->select('');
+$tabsheet->assign();
+
 // +-----------------------------------------------------------------------+
 // |                                edit tags                              |
 // +-----------------------------------------------------------------------+