diff --git a/circle/dashboard/static/dashboard/dashboard.css b/circle/dashboard/static/dashboard/dashboard.css
index 70cd684..489cad8 100644
--- a/circle/dashboard/static/dashboard/dashboard.css
+++ b/circle/dashboard/static/dashboard/dashboard.css
@@ -946,3 +946,7 @@ textarea[name="list-new-namelist"] {
   display: inline-block;
   vertical-align: middle;
 }
+
+#vm-list-search-checkbox-span {
+  cursor: pointer
+}
diff --git a/circle/dashboard/static/dashboard/vm-list.js b/circle/dashboard/static/dashboard/vm-list.js
index 59599ae..717ee80 100644
--- a/circle/dashboard/static/dashboard/vm-list.js
+++ b/circle/dashboard/static/dashboard/vm-list.js
@@ -167,14 +167,6 @@ $(function() {
     updateStatuses(1);
   }
  
-  $("#vm-list-search-checkbox-span").css("cursor", "pointer");
-
-  $("#vm-list-search-checkbox-span").click(function(e) {
-    if(e.target.type === "checkbox") return;
-    var checkbox = $(this).find("input");
-    checkbox.prop("checked", !checkbox.prop("checked"));
-    return false;
-  });
 });
 
 
diff --git a/circle/dashboard/templates/dashboard/vm-list.html b/circle/dashboard/templates/dashboard/vm-list.html
index 1103347..f25568c 100644
--- a/circle/dashboard/templates/dashboard/vm-list.html
+++ b/circle/dashboard/templates/dashboard/vm-list.html
@@ -34,10 +34,10 @@
                 <div class="input-group-btn">
                   {{ search_form.stype }}
                 </div>
-                <span class="input-group-addon input-tags" title="{% trans "Include deleted VMs" %}" 
+                <label class="input-group-addon input-tags" title="{% trans "Include deleted VMs" %}" 
                   id="vm-list-search-checkbox-span" data-container="body">
                   {{ search_form.include_deleted }}
-                </span>
+                </label>
                 <div class="input-group-btn">
                   <button type="submit" class="btn btn-primary input-tags"> 
                     <i class="fa fa-search"></i>