diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 928cab7..2471c06 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -27,6 +27,7 @@
 #include <gal-define-views-dialog.h>
 
 #include <libedataserverui/e-passwords.h>
+#include <libedataserverui/e-categories-editor.h>
 
 #define EVOLUTION_COPYRIGHT \
 	"Copyright \xC2\xA9 1999 - 2008 Novell, Inc. and Others"
@@ -893,6 +894,36 @@ action_page_setup_cb (GtkAction *action,
 }
 
 /**
+ * E_SHELL_WINDOW_ACTION_CATEGORIES
+ * @window: and #EShellWindow
+ *
+ * Activation of this action opens categories editor
+ *
+ * Main menu item: Edit -> Available categories
+ **/
+static void
+action_categories_cb (GtkAction *action,
+		      EShellWindow *shell_window)
+{
+	GtkWidget *dialog_content;
+	GtkWidget *dialog;
+	ECategoriesEditor *editor = E_CATEGORIES_EDITOR (e_categories_editor_new ());
+	e_categories_editor_set_entry_visible (editor, FALSE);
+
+	dialog = gtk_dialog_new_with_buttons (N_("Categories editor"),
+			GTK_WINDOW (shell_window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+			GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
+	dialog_content = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
+	gtk_box_pack_start (GTK_BOX (dialog_content), GTK_WIDGET (editor), TRUE, TRUE, 6);
+	gtk_box_set_spacing (GTK_BOX (dialog_content), 12);
+
+	gtk_dialog_run (GTK_DIALOG (dialog));
+
+	gtk_widget_destroy (dialog);
+}
+
+/**
  * E_SHELL_WINDOW_ACTION_PREFERENCES:
  * @window: an #EShellWindow
  *
@@ -1482,6 +1513,13 @@ static GtkActionEntry shell_entries[] = {
 	  N_("Paste the clipboard"),
 	  NULL },  /* Handled by EFocusTracker */
 
+	{ "categories",
+	  NULL,
+	  N_("Available Cate_gories"),
+	  NULL,
+	  N_("Edit categories"),
+	  G_CALLBACK (action_categories_cb) },
+
 	{ "preferences",
 	  GTK_STOCK_PREFERENCES,
 	  NULL,
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index f53b2b8..0b91677 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -34,6 +34,7 @@
       <separator/>
       <placeholder name='edit-actions'/>
       <separator/>
+      <menuitem action='categories' />
       <placeholder name='administrative-actions'/>
       <menuitem action='preferences'/>
     </menu>
