diff --git a/client/main.js b/client/main.js
index 6bb0c865de..d1a58593c2 100644
--- a/client/main.js
+++ b/client/main.js
@@ -69,12 +69,14 @@ $(document).ready(function() {
       $('#search-issue').unbind('click');
       $('#search-issue').on('click', function() {
           var queryIssue = window.location.href.toString();
-          window.open('https://github.com/FreeCodeCamp/FreeCodeCamp/issues?q=is:issue is:all '+ queryIssue.substr(queryIssue.lastIndexOf('challenges/') + 11).replace('/', ''), '_blank');
+          window.open('https://github.com/FreeCodeCamp/FreeCodeCamp/issues?q=' +
+            'is:issue is:all ' + (challenge_Name || challengeName) + ' OR ' +
+            queryIssue.substr(queryIssue.lastIndexOf('challenges/') + 11)
+            .replace('/', ''), '_blank');
       });
 
       $('#help-ive-found-a-bug-wiki-article').unbind('click');
       $('#help-ive-found-a-bug-wiki-article').on('click', function() {
-        var queryIssue = window.location.href.toString();
         window.open("https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Help-I've-Found-a-Bug", '_blank');
       });