diff --git a/tags/flickr_tags.module b/tags/flickr_tags.module
index 3e67052..88473b5 100644
--- a/tags/flickr_tags.module
+++ b/tags/flickr_tags.module
@@ -244,3 +244,37 @@ function flickr_tag_request_args($tags = array(), $mode = 'all') {
   }
   return $args;
 }
+
+/**
+ * Implements hook_menu_local_tasks_alter().
+ */
+function flickr_tags_menu_local_tasks_alter(&$data, $router_item, $root_path) {
+  global $user;
+  if ($root_path == 'flickr/%/tag/%') {
+    if (!empty($data['tabs'])) {
+      $data['tabs'][0]['count'] += 2;
+    }
+    else {
+      $data['tabs'][0]['count'] = 2;
+    }
+    $referer_base_name = basename($_SERVER["HTTP_REFERER"]);
+    $data['tabs'][0]['output'][] = array(
+      '#theme' => 'menu_local_task',
+      '#link' => array(
+        'title' => t('Cloud'),
+        'href' => 'flickr/' . $user->uid . '/tags/cloud',
+        'localized_options' => array(),
+      ),
+      '#active' => ($referer_base_name != 'list'),
+    );
+    $data['tabs'][0]['output'][] = array(
+      '#theme' => 'menu_local_task',
+      '#link' => array(
+        'title' => t('List'),
+        'href' => 'flickr/' . $user->uid . '/tags/list',
+        'localized_options' => array(),
+      ),
+      '#active' => ($referer_base_name == 'list'),
+    );
+  }
+}