diff --git a/fedora_repository.module b/fedora_repository.module
index 7a1c7946..a1151afd 100644
--- a/fedora_repository.module
+++ b/fedora_repository.module
@@ -994,20 +994,36 @@ function fedora_repository_islandora_tabs($content_models, $pid, $page_number) {
   
   //can disable showing the object details tab in admin UI
   if (variable_get('fedora_repository_show_object_details_tab', TRUE)) {
-    $object_details = $obj->showFieldSets();
-    if ($object_details['fedora_object_details']['#selected'] == TRUE) {
-      foreach (element_children($cmodels_tabs) as $key) {
-        $cmodels_tabs[$key]['#selected'] = FALSE;
-      }
-    }
-  }
-  else {
-    $object_details = array();
+    $object_details = $obj->showFieldSets();
+    $cmodel_tabs = array_merge($cmodels_tabs, $object_details);
   }
   
   return array_merge($cmodels_tabs, $object_details);
 }
 
+/**
+ * Implementation of hook_islandora_tabs_alter().
+ * 
+ * @param &$tabs array
+ *   The array of tabs/tabset to alter.
+ * @param $params array
+ *   An associative array containing the parameters with which the original
+ *   hook was called.
+ * @see fedora_repository_get_items()
+ */
+function fedora_repository_islandora_tabs_alter(&$tabs, $params) {
+  //Deselect all other tabs if the fedora_object_details tab is supposed
+  //  to be selected.
+  $object_details_key = 'fedora_object_details';
+  if ($tabs[$object_details_key]['#selected']) {
+    foreach (element_children($tabs) as $key) {
+      if ($key != $object_details_key) {
+        $tabs[$key]['#selected'] = FALSE;
+      }
+    }
+  }
+}
+
 /**
  * Sends an ITQL query to the Fedora Resource index (can only communicate with Kowari or mulgara)
  * Reads the pid and datastream id as url parameters.  Queries the collection object for the query