diff --git a/style.css b/style.css
index 64d099f..7f6ff79 100644
--- a/style.css
+++ b/style.css
@@ -122,8 +122,8 @@ table th {
   #branding .breadcrumb-depth-7 { z-index:3; }
   #branding .breadcrumb-depth-8 { z-index:2; }
 
-  #branding .breadcrumb a,
-  #branding .breadcrumb strong {
+  #branding .breadcrumb-link > a,
+  #branding .breadcrumb-link > strong {
     color:#fff;
     font-weight:normal;
     float:left;
diff --git a/template.php b/template.php
index 4a3a929..305dab6 100644
--- a/template.php
+++ b/template.php
@@ -342,7 +342,7 @@ function rubik_breadcrumb($vars) {
     $item = menu_get_item();
     $end = end($vars['breadcrumb']);
     if ($end && strip_tags($end) !== $item['title']) {
-      $vars['breadcrumb'][] = "<strong>". check_plain($item['title']) ."</strong>";
+      $vars['breadcrumb'][] = check_plain($item['title']);
     }
   }
 
@@ -354,6 +354,13 @@ function rubik_breadcrumb($vars) {
 
   $depth = 0;
   foreach ($vars['breadcrumb'] as $link) {
+
+    // If the item isn't a link, surround it with a strong tag to format it like
+    // one.
+    if (!preg_match('/^<a/', $link) && !preg_match('/^<strong/', $link)) {
+      $link = '<strong>' . $link . '</strong>';
+    }
+
     $output .= "<span class='breadcrumb-link breadcrumb-depth-{$depth}'>{$link}</span>";
     $depth++;
   }