diff --git a/.config/lf/lfrc b/.config/lf/lfrc
index c1118b1b1..ad20dfdba 100644
--- a/.config/lf/lfrc
+++ b/.config/lf/lfrc
@@ -213,6 +213,14 @@ cmd new_lf_term &{{
     [ -n "$TMUX" ] && previewer=ueberzug
     [ -n "$VIM" ] && previewer=chafa
     lf -remote "send $id set_previewer $previewer"
+
+    # Clean up tags that don't exist anymore
+    echo "$(
+        while read -r l; do
+            file=$(echo "$l" | cut -d ':' -f 1)
+            [ -e "$file" ] && echo "$l"
+        done <"${XDG_DATA_HOME}/lf/tags"
+    )" >"${XDG_DATA_HOME}/lf/tags"
 }}
 on-cd
 
diff --git a/.local/bin/upgrades b/.local/bin/upgrades
index 8e139589c..c193d9460 100755
--- a/.local/bin/upgrades
+++ b/.local/bin/upgrades
@@ -1,12 +1,9 @@
 #!/bin/sh
 
-read -r script<<EOF
-sudo xbps-install -Su
-pkill -RTMIN+8 dwmblocks
-EOF
+script="sudo xbps-install -Su; pkill -RTMIN+8 dwmblocks"
 
 if [ -n "$TERM_PROGRAM" ]; then
-    $script
+    sh -c "$script"
 else
     st -e sh -c "
         $script