2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/history-substring-search/README.markdown b/plugins/history-substring-search/README.markdown
index 143b813a1..c154afdce 100644
--- a/plugins/history-substring-search/README.markdown
+++ b/plugins/history-substring-search/README.markdown
@@ -1,6 +1,6 @@
 To activate this script, please include it the `plugins` variable within `~/.zshrc`
 
-  `plugins=(git history-substring-search.zsh)`
+  `plugins=(git history-substring-search)`
 
 See the "history-substring-search.zsh" file for more information:
 
diff --git a/plugins/history-substring-search/history-substring-search.zsh b/plugins/history-substring-search/history-substring-search.zsh
index 22f03dd6d..65f0750db 100644
--- a/plugins/history-substring-search/history-substring-search.zsh
+++ b/plugins/history-substring-search/history-substring-search.zsh
@@ -175,7 +175,6 @@ fi
 # implementation details
 #-----------------------------------------------------------------------------
 
-setopt extendedglob
 zmodload -F zsh/parameter
 
 #
@@ -284,6 +283,7 @@ if [[ $+functions[_zsh_highlight] -eq 0 ]]; then
 fi
 
 function _history-substring-search-begin() {
+  setopt localoptions extendedglob
   _history_substring_search_move_cursor_eol=false
   _history_substring_search_query_highlight=
 
@@ -350,6 +350,7 @@ function _history-substring-search-begin() {
 }
 
 function _history-substring-search-end() {
+  setopt localoptions extendedglob
   _history_substring_search_result=$BUFFER
 
   # move the cursor to the end of the command line