2 files changed, 16 insertions, 5 deletions
diff --git a/addressbook/gui/component/e-book-shell-module.c b/addressbook/gui/component/e-book-shell-module.c
index 276e6f0a24..fbe660b7b6 100644
--- a/addressbook/gui/component/e-book-shell-module.c
+++ b/addressbook/gui/component/e-book-shell-module.c
@@ -424,10 +424,9 @@ e_shell_module_init (GTypeModule *type_module)
 	shell_module = E_SHELL_MODULE (type_module);
 	shell = e_shell_module_get_shell (shell_module);
 
-	/* Register the GType for EBookShellView. */
-	e_book_shell_view_get_type (type_module);
-
-	e_shell_module_set_info (shell_module, &module_info);
+	e_shell_module_set_info (
+		shell_module, &module_info,
+		e_book_shell_view_get_type (type_module));
 
 	book_shell_module_init_importers ();
 	book_shell_module_ensure_sources (shell_module);
diff --git a/addressbook/gui/component/e-book-shell-view-actions.c b/addressbook/gui/component/e-book-shell-view-actions.c
index 8ade5e6805..6085bc5d82 100644
--- a/addressbook/gui/component/e-book-shell-view-actions.c
+++ b/addressbook/gui/component/e-book-shell-view-actions.c
@@ -449,6 +449,9 @@ action_gal_save_custom_view_cb (GtkAction *action,
 	EAddressbookView *address_view;
 	GalViewInstance *view_instance;
 
+	/* All shell views respond to the activation of this action,
+	 * which is defined by EShellWindow.  But only the currently
+	 * active shell view proceeds with saving the custom view. */
 	shell_view = E_SHELL_VIEW (book_shell_view);
 	if (!e_shell_view_is_active (shell_view))
 		return;
@@ -463,6 +466,15 @@ static void
 action_search_execute_cb (GtkAction *action,
                           EBookShellView *book_shell_view)
 {
+	EShellView *shell_view;
+
+	/* All shell views respond to the activation of this action,
+	 * which is defined by EShellWindow.  But only the currently
+	 * active shell view proceeds with executing the search. */
+	shell_view = E_SHELL_VIEW (book_shell_view);
+	if (!e_shell_view_is_active (shell_view))
+		return;
+
 	e_book_shell_view_execute_search (book_shell_view);
 }
 
@@ -471,7 +483,7 @@ action_search_filter_cb (GtkRadioAction *action,
                          GtkRadioAction *current,
                          EBookShellView *book_shell_view)
 {
-	action_search_execute_cb (GTK_ACTION (current), book_shell_view);
+	e_book_shell_view_execute_search (book_shell_view);
 }
 
 static GtkActionEntry contact_entries[] = {