diff --git a/config/vufind/EDS.ini b/config/vufind/EDS.ini
index 07bf4aa9ecdaf50413d67c0c41b255624e569a98..0354ae03da0830828688005d69d8ea4ba56f5c78 100644
--- a/config/vufind/EDS.ini
+++ b/config/vufind/EDS.ini
@@ -222,6 +222,9 @@ enabled = true
 ; Define a default_handler 
 default_handler = Eds
 
+; Auto-submit autocomplete on click or enter
+auto_submit = true
+
 ; In this section, set the key equal to a search type from [Basic_Searches] and
 ; the value equal to an autocomplete handler in order to customize autocompletion
 ; behavior when that search type is selected. (default: Eds:rawqueries)
diff --git a/module/VuFind/src/VuFind/Search/Base/Options.php b/module/VuFind/src/VuFind/Search/Base/Options.php
index 4efcedbd2f8b9ccb03c934433468dbd325ca1257..882024b6624c991d1a5d89a161d355216ea6742e 100644
--- a/module/VuFind/src/VuFind/Search/Base/Options.php
+++ b/module/VuFind/src/VuFind/Search/Base/Options.php
@@ -231,7 +231,7 @@ abstract class Options implements TranslatorAwareInterface
      *
      * @var bool
      */
-    protected $autocompleteAutoSubmit = false;
+    protected $autocompleteAutoSubmit = true;
 
     /**
      * Configuration file to read global settings from