diff --git a/inc/entity.class.php b/inc/entity.class.php
index 03c7bd650e3..86448cf8500 100644
--- a/inc/entity.class.php
+++ b/inc/entity.class.php
@@ -837,8 +837,10 @@ static function showSelector($target, $myname) {
              __s('Show all')."\">".str_replace(" ","&nbsp;",__('Show all'))."</a></div>";
 
       echo "<div class='left' style='width:100%'>";
+      echo "<form id='entsearchform'>";
       echo Html::input('entsearchtext', array('id' => 'entsearchtext'));
       echo Html::submit(__('Search'), array('id' => 'entsearch'));
+      echo "</form>";
 
       echo "<script type='text/javascript'>";
       echo Html::jsGetElementbyID("tree_projectcategory$rand")."
@@ -893,12 +895,15 @@ static function showSelector($target, $myname) {
         function (e, data) {
             document.location.href = data.rslt.obj.children('a').attr('href');
         });
-         $('#entsearch').click(function () {
+
+         $('#entsearchform').submit(function( event ) {
+            // cancel submit of entity search form
+            event.preventDefault();
+
             ".Html::jsGetElementbyID("tree_projectcategory$rand").".jstree('close_all');;
             ".Html::jsGetElementbyID("tree_projectcategory$rand").
             ".jstree('search',".Html::jsGetDropdownValue('entsearchtext').");
          });
-
         ";