diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c
index fc7c841..f382e31 100644
--- a/modules/addressbook/e-book-shell-view-actions.c
+++ b/modules/addressbook/e-book-shell-view-actions.c
@@ -27,6 +27,8 @@
 
 #include <addressbook-config.h>
 
+#include <libedataserverui/e-categories-dialog.h>
+
 static void
 action_address_book_copy_cb (GtkAction *action,
                              EBookShellView *book_shell_view)
@@ -355,6 +357,36 @@ action_contact_find_cb (GtkAction *action,
 }
 
 static void
+edit_categories_response (GtkDialog *dialog, gint response, gpointer user_data)
+{
+	gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static void
+action_edit_categories_cb (GtkAction *action,
+			   EBookShellView *book_shell_view)
+{
+	GtkDialog *dialog;
+	GtkWidget *widget;
+
+	dialog = GTK_DIALOG (e_categories_dialog_new (NULL));
+	g_return_if_fail (dialog);
+
+	/* Hide the original OK/Cancel buttons and replace it by our own Close button
+	   which is always sensitive */
+	widget = gtk_dialog_get_widget_for_response (dialog, GTK_RESPONSE_CANCEL);
+	gtk_widget_hide (widget);
+	widget = gtk_dialog_get_widget_for_response (dialog, GTK_RESPONSE_OK);
+	gtk_widget_hide (widget);
+	gtk_dialog_add_button (dialog, GTK_STOCK_CLOSE, GTK_RESPONSE_OK);
+
+	g_signal_connect (dialog, "response",
+		G_CALLBACK (edit_categories_response), NULL);
+
+	gtk_widget_show (GTK_WIDGET (dialog));
+}
+
+static void
 action_contact_forward_cb (GtkAction *action,
                            EBookShellView *book_shell_view)
 {
@@ -745,6 +777,13 @@ static GtkActionEntry contact_entries[] = {
 	  N_("Search for text in the displayed contact"),
 	  G_CALLBACK (action_contact_find_cb) },
 
+	 { "edit-categories",
+	   NULL,
+	   N_("Ca_tegories"),
+	   NULL,
+	   N_("Display dialog for editing categories"),
+	   G_CALLBACK (action_edit_categories_cb) },
+
 	{ "contact-forward",
 	  "mail-forward",
 	  N_("_Forward Contact..."),
diff --git a/ui/evolution-contacts.ui b/ui/evolution-contacts.ui
index 763e43c..4827ec4 100644
--- a/ui/evolution-contacts.ui
+++ b/ui/evolution-contacts.ui
@@ -19,6 +19,8 @@
         <menuitem action='address-book-delete'/>
         <separator/>
         <menuitem action='contact-find'/>
+        <separator/>
+        <menuitem action='edit-categories'/>
       </placeholder>
     </menu>
     <menu action='view-menu'>
