diff --git a/APPL/ALG/alg_district_search.asp b/APPL/ALG/alg_district_search.asp
index fa043a3f43..99e1f7fe18 100644
--- a/APPL/ALG/alg_district_search.asp
+++ b/APPL/ALG/alg_district_search.asp
@@ -64,7 +64,7 @@ var authparams = alg.checkAutorisation();
 <%    BLOCK_END();
   var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
                    {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];
-  CreateButtons(buttons); %>
+  CreateButtons(buttons, { entersubmit: true }); %>
     </form>
 
     </div> <!-- search -->
diff --git a/APPL/ALG/alg_gebouw_search.asp b/APPL/ALG/alg_gebouw_search.asp
index 9c40000546..bf5a23f705 100644
--- a/APPL/ALG/alg_gebouw_search.asp
+++ b/APPL/ALG/alg_gebouw_search.asp
@@ -86,7 +86,7 @@ var authparams = alg.checkAutorisation();
 
   var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
                    {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];
-  CreateButtons(buttons);
+  CreateButtons(buttons, { entersubmit: true });
 %>
       </form>
     </div> <!-- search -->
diff --git a/APPL/ALG/alg_locatie_search.asp b/APPL/ALG/alg_locatie_search.asp
index b0832417fb..486ec92155 100644
--- a/APPL/ALG/alg_locatie_search.asp
+++ b/APPL/ALG/alg_locatie_search.asp
@@ -67,7 +67,7 @@ var authparams = alg.checkAutorisation();
 
   var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
                    {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];
-  CreateButtons(buttons);
+  CreateButtons(buttons, { entersubmit: true });
 %>
       </form>
     </div> <!-- search -->
diff --git a/APPL/ALG/alg_regio_search.asp b/APPL/ALG/alg_regio_search.asp
index 31d3fb12ab..6eefd9a7f2 100644
--- a/APPL/ALG/alg_regio_search.asp
+++ b/APPL/ALG/alg_regio_search.asp
@@ -52,7 +52,7 @@ var authparams = alg.checkAutorisation();
 <%    BLOCK_END(); %>
 <%
   var buttons =  [{title: L("lcl_search"), action: "document.forms.u2.submit();", id: "bSearch" }];
-  CreateButtons(buttons);
+  CreateButtons(buttons, { entersubmit: true });
 %>
       </form>
     </div> <!-- search -->
diff --git a/APPL/ALG/alg_ruimte_search.asp b/APPL/ALG/alg_ruimte_search.asp
index 0f52a98b56..c1ef0fda4b 100644
--- a/APPL/ALG/alg_ruimte_search.asp
+++ b/APPL/ALG/alg_ruimte_search.asp
@@ -102,7 +102,7 @@ var authparams = alg.checkAutorisation();
 
   var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
                    {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];
-  CreateButtons(buttons);
+  CreateButtons(buttons, { entersubmit: true });
 %>
       </form>
     </div> <!-- search -->
diff --git a/APPL/ALG/alg_terreinsector_search.asp b/APPL/ALG/alg_terreinsector_search.asp
index f179af9732..652c68e926 100644
--- a/APPL/ALG/alg_terreinsector_search.asp
+++ b/APPL/ALG/alg_terreinsector_search.asp
@@ -89,7 +89,7 @@ var authparams = alg.checkAutorisation();
 <%
   var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
                    {title: L("lcl_obj_advanced"), action: "myModal()", id:"bAdvanced" } ];
-  CreateButtons(buttons);
+  CreateButtons(buttons, { entersubmit: true });
 %>
       </form>
     </div> <!-- search -->
diff --git a/APPL/ALG/alg_verdieping_search.asp b/APPL/ALG/alg_verdieping_search.asp
index 7e901c6e50..af91e31af6 100644
--- a/APPL/ALG/alg_verdieping_search.asp
+++ b/APPL/ALG/alg_verdieping_search.asp
@@ -68,7 +68,7 @@ var authparams = alg.checkAutorisation();
 
   var buttons =  [ {title: L("lcl_search"), action: "doSubmit();", id: "bSearch" },
                    {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];
-  CreateButtons(buttons);
+  CreateButtons(buttons, { entersubmit: true });
 %>
       </form>
     </div> <!-- search -->
diff --git a/APPL/ALG/alg_werkplek_search.asp b/APPL/ALG/alg_werkplek_search.asp
index 9a37daa04c..cb3f5da8e3 100644
--- a/APPL/ALG/alg_werkplek_search.asp
+++ b/APPL/ALG/alg_werkplek_search.asp
@@ -72,7 +72,7 @@ var authparams = alg.checkAutorisation();
 <%    BLOCK_END();
 
   var buttons =  [ {title: L("lcl_search"), action: "document.forms.u2.submit();", id: "bSearch" } ];
-  CreateButtons(buttons);
+  CreateButtons(buttons, { entersubmit: true });
 %>
       </form>
     </div> <!-- search -->