diff --git a/src/main.sh b/src/main.sh
index 9b61bbc..5cdfa97 100755
--- a/src/main.sh
+++ b/src/main.sh
@@ -918,7 +918,11 @@ __tentative_toggle() {
 # @req $AWK_ATTACH: Awk script to add attachment
 __add_attachment() {
   fpath="$ROOT/$1"
-  f=$($FZF --prompt="Select attachment> ")
+  f=$(
+    $FZF --prompt="Select attachment> " \
+      --walker="file,hidden" \
+      --walker-root="$HOME"
+  )
   if [ -z "$f" ] || [ ! -f "$f" ]; then
     return
   fi
@@ -1272,6 +1276,7 @@ while true; do
             --bind="start:hide-input" \
             --bind="ctrl-alt-d:show-input+change-query(ctrl-alt-d)+accept" \
             --bind="load:transform:[ \"\$FZF_TOTAL_COUNT\" -eq 0 ] && echo 'unbind(enter)+unbind(ctrl-alt-d)'" \
+            --bind="w:toggle-wrap" \
             --bind="j:down" \
             --bind="k:up" ||
           true
@@ -1349,6 +1354,8 @@ while true; do
         case $yn in
         "yes")
           $OPEN "$attpath"
+          printf "Press <enter> to continue." >/dev/tty
+          read -r tmp
           break
           ;;
         "no")