plugins/README.md |  2 +-
 plugins/finder    | 99 +++++++++++++++++++++++++++++++++++++++++++----------

diff --git a/plugins/README.md b/plugins/README.md
index fea4a3fd3962fb176caacb147b172a9f6c10b78c..c139da1bd06de04bed818d022f77cc7f74416ddf 100644
--- a/plugins/README.md
+++ b/plugins/README.md
@@ -23,7 +23,7 @@ | [cmusq](cmusq) | Queue/play files/dirs in cmus player [✓] | sh | cmus, pgrep |
 | [diffs](diffs) | Diff for selection (limited to 2 for directories) [✓] | sh | vimdiff, mktemp |
 | [dragdrop](dragdrop) | Drag/drop files from/into nnn | sh | [dragon](https://github.com/mwh/dragon) |
 | [dups](dups) | List non-empty duplicate files in current dir | bash | find, md5sum,<br>sort uniq xargs |
-| [finder](finder) | Run custom find command and list | sh | - |
+| [finder](finder) | Run custom find command (**stored in histfile**) and list | sh | - |
 | [fixname](fixname) | Clean filename to be more shell-friendly [✓] | bash | sed |
 | [fzcd](fzcd) | Fuzzy search multiple dirs (or `$PWD`) and visit file | sh | fzf, (find) |
 | [fzhist](fzhist) | Fuzzy-select a cmd from history, edit in `$EDITOR` and run | sh | fzf, mktemp |
diff --git a/plugins/finder b/plugins/finder
index bd34d5d9afebbfa26c8d33e61913881e5c1595d8..8d7ea12fb45a5ea51aec1788bee13fd45265fd15 100755
--- a/plugins/finder
+++ b/plugins/finder
@@ -1,28 +1,89 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 # Description: Run custom search and list results in smart context
 #
-# Note: To enable multi select in fzf, export the following:
-#       - export FZF_DEFAULT_OPTS='--bind ctrl-a:select-all,ctrl-d:deselect-all,ctrl-t:toggle'
+# Note: This plugin retains search history
+#
+# Usage:
+#   Run plugin and enter e.g. "-size +10M" to list files in current
+#   directory larger than 10M. By default entered expressions are
+#   interpreted as arguments to find. Results have to be NUL
+#   terminated which is done by default for find. Alternatively one
+#   can prepend a '$' to run a custom search program such as fd or
+#   ripgrep. Entered expressions will be saved in history file to
+#   be listed as bookmarks and and can be entered by index and edited.
 #
-# Shell: POSIX compliant
-# Author: Arun Prakash Jana
+# Shell: Bash
+# Author: Arun Prakash Jana, Luuk van Baal
+TMPDIR="${TMPDIR:-/tmp}"
+NNN_FINDHIST="${NNN_FINDHIST:-${XDG_CONFIG_HOME:-$HOME/.config}/nnn/finderbms}"
+NNN_FINDHISTLEN="${NNN_FINDHISTLEN:-10000}"
+
+printexamples() {
+    printf -- "-maxdepth 1 -name pattern
+-maxdepth 1 -size +100M
+\$fd -0 pattern
+\$fd -0 -d 2 -S +100M
+\$grep -rlZ pattern
+\$rg -l0 pattern
+\$fzf -m | tr '\\\n' '\\\0'\n"
+}
+
+printexprs() {
+    for ((i = "$1"; i < ${#fexprs[@]}; i++)); do
+        printf '%s\t%s\n' "$((i + 1))" "${fexprs[$i]}"
+    done
+}
+
+mapexpr() {
+    if [ "$fexpr" -eq "$fexpr" ] 2>/dev/null; then
+        fexpr=${fexprs[$((fexpr - 1))]}
+        read -r -e -p "Search expression: " -i "$fexpr" fexpr
+    else
+        return 1
+    fi
+}
+
+readexpr() {
+    case "$fexpr" in
+        h)   clear
+             printf "Examples:\n"
+             mapfile -t fexprs < <(printexamples)
+             printexprs 0
+             read -r -p "Search expression or index: " fexpr
+             mapexpr
+             [ -n "$fexpr" ] && readexpr ;;
+        \$*) cmd="${fexpr:1}" ;;
+        *)   mapexpr && readexpr
+             cmd="find $fexpr -print0" ;;
+    esac
+}
+
+clear
+[ -f "$NNN_FINDHIST" ] || printexamples > "$NNN_FINDHIST"
 
-. "$(dirname "$0")"/.nnn-plugin-helper
+mapfile -t fexprs < <(sort "$NNN_FINDHIST" | uniq -c | sort -nr | head -n5 |\
+  awk '{for (i=2; i<NF; i++) printf $i " "; print $NF}')
+printf "Most used earch expressions:\n"
+printexprs 0
 
-printf "Examples:\n"
-printf "  find . -name \"pattern*\" -print0\n"
-printf "  fd pattern -0\n"
-printf "  find -maxdepth 1 -size +100M -print0\n"
-printf "  fd -d 2 -S +100M -0\n"
-printf "  grep -rlZ pattern\n"
-printf "  rg -l0 pattern\n"
-printf "  fzf -m | tr %s %s\n\n" "'\n'" "'\0'"
+mapfile -t -O"$i" fexprs < <(tac "$NNN_FINDHIST" | awk '!a[$0]++' | head -n5)
+printf "Most recently used search expressions:\n"
+printexprs "$i"
+read -r -p "Search expression or index (h for help): " fexpr
 
-printf "cmd: "
-read -r cmd
+mapexpr
 
-if [ -n "$cmd" ]; then
-    printf "%s" "+l" > "$NNN_PIPE"
-    eval "$cmd" > "$NNN_PIPE"
+if [ -n "$fexpr" ]; then
+    printf "+l" > "$NNN_PIPE"
+    while :; do
+        readexpr
+        eval "$cmd" > "$NNN_PIPE" && break
+        read -r -e -p "Search expression: " -i "$fexpr" fexpr
+    done
+    if [ -n "$fexpr" ]; then
+        tail -n"$NNN_FINDHISTLEN" "$NNN_FINDHIST" > "$TMPDIR/finderbms"
+        printf "%s\n" "$fexpr" >> "$TMPDIR/finderbms"
+        mv "$TMPDIR/finderbms" "$NNN_FINDHIST"
+    fi
 fi