diff --git a/bitbake/lib/toaster/toastergui/static/js/machines.js b/bitbake/lib/toaster/toastergui/static/js/machines.js
index 1b7ea36893..ee8c9804cc 100644
--- a/bitbake/lib/toaster/toastergui/static/js/machines.js
+++ b/bitbake/lib/toaster/toastergui/static/js/machines.js
@@ -90,4 +90,9 @@ function machinesPageInit (ctx) {
         window.location.replace(ctx.projectPageUrl);
     }, null);
   });
+
+  $("#show-all-btn").click(function(){
+    $("#search").val("")
+    $("#searchform").submit();
+  });
 }
diff --git a/bitbake/lib/toaster/toastergui/templates/machines.html b/bitbake/lib/toaster/toastergui/templates/machines.html
index 9930a94f4d..f63e8977fb 100644
--- a/bitbake/lib/toaster/toastergui/templates/machines.html
+++ b/bitbake/lib/toaster/toastergui/templates/machines.html
@@ -34,7 +34,7 @@
       {% if objects.paginator.count != 0 %}
         {{objects.paginator.count}} machines found
        {% else %}
-        No Machines found
+        No machines found
        {% endif %}
     {% else %}
 
@@ -54,7 +54,7 @@
     <input type="hidden" name="orderby" value="">
       <input type="hidden" name="page" value="1">
         <button class="btn" type="submit" value="Search">Search</button>
-        <button type="submit" class="btn btn-link"><a href="{%url 'machines' %}">Show all machines</a></button>
+        <button type="submit" class="btn btn-link" id="show-all-btn">Show all machines</button>
       </form>
     </div>
 {% else %}