diff --git a/.github/dependencies.yml b/.github/dependencies.yml
index d3b26936180b..ce28e34c9841 100644
--- a/.github/dependencies.yml
+++ b/.github/dependencies.yml
@@ -21,7 +21,7 @@ dependencies:
   plugins/history-substring-search:
     repo: zsh-users/zsh-history-substring-search
     branch: master
-    version: 8dd05bfcc12b0cd1ee9ea64be725b3d9f713cf64
+    version: 87ce96b1862928d84b1afe7c173316614b30e301
     precopy: |
       set -e
       rm -f zsh-history-substring-search.plugin.zsh
diff --git a/plugins/history-substring-search/README.md b/plugins/history-substring-search/README.md
index 4be744c4c7b2..71a389535527 100644
--- a/plugins/history-substring-search/README.md
+++ b/plugins/history-substring-search/README.md
@@ -57,13 +57,13 @@ Using [antigen](https://github.com/zsh-users/antigen):
 
 1. Add the `antigen bundle` command just before `antigen apply`, like this:
 
-```
+``` 
 antigen bundle zsh-users/zsh-history-substring-search
 antigen apply
 ```
-
+ 
 2. Then, **after** `antigen apply`, add the key binding configurations, like this:
-
+ 
 ```
 # zsh-history-substring-search configuration
 bindkey '^[[A' history-substring-search-up # or '\eOA'
@@ -120,7 +120,7 @@ Usage
           bindkey "$terminfo[kcuu1]" history-substring-search-up
           bindkey "$terminfo[kcud1]" history-substring-search-down
 
-      Users have also observed that `[OA` and `[OB` are correct values,
+      Users have also observed that `[OA` and `[OB` are correct values, 
       _even if_ these were not the observed values. If you are having trouble
       with the observed values, give these a try.
 
diff --git a/plugins/history-substring-search/history-substring-search.zsh b/plugins/history-substring-search/history-substring-search.zsh
index 471cc9ad116e..2137b79502af 100644
--- a/plugins/history-substring-search/history-substring-search.zsh
+++ b/plugins/history-substring-search/history-substring-search.zsh
@@ -406,7 +406,7 @@ _history-substring-search-end() {
 
   # For debugging purposes:
   # zle -R "mn: "$_history_substring_search_match_index" m#: "${#_history_substring_search_matches}
-  # read -k -t 200 && zle -U $REPLY
+  # read -k -t 200 && zle -U -- "$REPLY"
 
   #
   # When this function returns, z-sy-h runs its line-pre-redraw hook. It has no
@@ -421,7 +421,7 @@ _history-substring-search-end() {
     # before removing search highlight and exiting. This ensures no highlights
     # are left lingering after search is finished.
     #
-    read -k -t ${HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_TIMEOUT:-1} && zle -U $REPLY
+    read -k -t ${HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_TIMEOUT:-1} && zle -U -- "$REPLY"
     region_highlight=( "${(@)region_highlight:#*${highlight_memo}*}" )
   fi