diff --git a/mozilla/webtools/testopia/Bugzilla/Testopia/Search.pm b/mozilla/webtools/testopia/Bugzilla/Testopia/Search.pm
index e17696362d1..4b951728e9b 100644
--- a/mozilla/webtools/testopia/Bugzilla/Testopia/Search.pm
+++ b/mozilla/webtools/testopia/Bugzilla/Testopia/Search.pm
@@ -560,12 +560,22 @@ sub init {
                $f = "milestones.value";
          },
          "^bug," => sub {
+             if ($obj eq 'case_run'){
                push(@supptables,
                       "INNER JOIN test_case_bugs AS case_bugs " .
                       "ON test_case_runs.case_run_id = case_bugs.case_run_id");
                push(@supptables,
                       "INNER JOIN bugs ".
                       "ON case_bugs.bug_id = bugs.bug_id");
+             }
+             elsif($obj eq 'case'){
+               push(@supptables,
+                      "INNER JOIN test_case_bugs AS case_bugs " .
+                      "ON test_cases.case_id = case_bugs.case_id");
+               push(@supptables,
+                      "INNER JOIN bugs ".
+                      "ON case_bugs.bug_id = bugs.bug_id");
+             }
                $f = "bugs.bug_id";
          },
          "^case_summary," => sub {
diff --git a/mozilla/webtools/testopia/template/en/default/hook/bug/knob.html.tmpl/links/tr.html.tmpl b/mozilla/webtools/testopia/template/en/default/hook/bug/knob.html.tmpl/links/tr.html.tmpl
index 5c60abc3039..e3466296fc6 100644
--- a/mozilla/webtools/testopia/template/en/default/hook/bug/knob.html.tmpl/links/tr.html.tmpl
+++ b/mozilla/webtools/testopia/template/en/default/hook/bug/knob.html.tmpl/links/tr.html.tmpl
@@ -1,4 +1,4 @@
 [%# 1.0@bugzilla.org %]
         
           |  
-        <a href="tr_list_caseruns.cgi?bug_id=[% bug.bug_id FILTER none %]&current_tab=case_run">View [% terms.Bug %] Test Case Runs</a>
+        <a href="tr_list_cases.cgi?bug_id=[% bug.bug_id FILTER none %]&current_tab=case">View [% terms.Bug %] Test Cases</a>