diff --git a/better_exposed_filters.theme b/better_exposed_filters.theme
index 61b973f..c529ecc 100644
--- a/better_exposed_filters.theme
+++ b/better_exposed_filters.theme
@@ -447,6 +447,10 @@
 
   // Go through each filter option and build the appropriate link or plain text
   foreach ($element['#options'] as $option => $elem) {
+    if (!empty($element['#hidden_options'][$option])) {
+      continue;
+    }
+
     // Check for Taxonomy-based filters
     if (is_object($elem)) {
       $slice = array_slice($elem->option, 0, 1, TRUE);
@@ -469,6 +473,7 @@
     $multiple = !empty($element['#multiple']);
 
     foreach ($element_set as $key => $value) {
+      $element_output = '';
       // Custom ID for each link based on the <select>'s original ID
       $id = drupal_html_id($element['#id'] . '-' . $key);
       $elem = array(
@@ -479,12 +484,25 @@
       );
       if (array_search($key, $selected_options) === FALSE) {
         $elem['#children'] = l($value, bef_replace_query_string_arg($name, $key, $multiple));
-        $output .= theme('form_element', array('element' => $elem));
+        $element_output = theme('form_element', array('element' => $elem));
+
+        if ($element['#name'] == 'sort_bef_combine' && !empty($element['#settings']['toggle_links'])) {
+          $sort_pair = explode(' ', $key);
+          if (count($sort_pair) == 2) {
+            // Highlight the link if it is the selected sort_by (can be either
+            // asc or desc, it doesn't matter).
+            if (strpos($selected_options[0], $sort_pair[0]) === 0) {
+              $element_output = str_replace('form-item', 'form-item selected', $element_output);
+            }
+          }
+        }
       } else {
         $elem['#children'] = l($value, bef_replace_query_string_arg($name, $key, $multiple, true));
         _form_set_class($elem, array('bef-select-as-links-selected'));
-        $output .= str_replace('form-item', 'form-item selected', theme('form_element', array('element' => $elem)));
+        $element_output = str_replace('form-item', 'form-item selected', theme('form_element', array('element' => $elem)));
       }
+
+      $output .= $element_output;
     }
   }
 
diff --git a/better_exposed_filters_exposed_form_plugin.inc b/better_exposed_filters_exposed_form_plugin.inc
index cb8ce14..e24c55c 100644
--- a/better_exposed_filters_exposed_form_plugin.inc
+++ b/better_exposed_filters_exposed_form_plugin.inc
@@ -71,6 +71,7 @@
           'default' => t('Default select list'),
           'bef' => t('Radio Buttons'),
           'bef_links' => t('Links'),
+          'bef_toggle_links' => t('Toggle Links'),
         ),
         '#description' => t('Select a format for the exposed sort options.'),
       );
@@ -396,6 +397,9 @@
           '#title' => $form['sort_by']['#title'],   // Already sanitized by Views
         );
         $options = array();
+        // If using the bef_toggle_links format, determine which links should
+        // not be shown.
+        $hidden_options = array();
 
         // Add reset sort option at the top of the list
         if ($settings['sort']['advanced']['reset']) {
@@ -406,6 +410,7 @@
         }
 
         $selected = '';
+        $used_sort_keys = array();
         foreach ($form['sort_by']['#options'] as $by_key => $by_val) {
           foreach ($form['sort_order']['#options'] as $order_key => $order_val) {
             // Use a space to separate the two keys, we'll unpack them in our submit handler
@@ -415,6 +420,17 @@
               // Respect default sort order set in Views. The default sort field
               // will be the first one if there are multiple sort criteria.
               $selected = "$by_key $order_key";
+            }
+            if ($settings['sort']['bef_format'] == 'bef_toggle_links') {
+              if (isset($used_sort_keys[$by_key])
+                || (!empty($form_state['input']['sort_bef_combine']) && $form_state['input']['sort_bef_combine'] == "$by_key $order_key")
+                || (empty($form_state['input']['sort_bef_combine']) && $selected == "$by_key $order_key")
+              ) {
+                $hidden_options["$by_key $order_key"] = "$by_val $order_val";
+              }
+              else {
+                $used_sort_keys[$by_key] = $order_key;
+              }
             }
           }
         }
@@ -442,6 +458,10 @@
         $form['sort_bef_combine'] = array(
           '#type' => 'radios',
           '#options' => $options,
+          '#hidden_options' => $hidden_options,
+          '#settings' => array(
+            'toggle_links' => ($settings['sort']['bef_format'] == 'bef_toggle_links'),
+          ),
           '#default_value' => $selected,
           '#title' => $form['sort_by']['#title'],   // Already sanitized by Views
         );
@@ -454,6 +474,7 @@
             break;
 
           case 'bef_links':
+          case 'bef_toggle_links':
             $form['sort_bef_combine']['#theme'] = 'select_as_links';
             break;