diff --git a/etc/sway/modes/recording.conf b/etc/sway/modes/recording.conf
index 41a2b58..410bd4e 100644
--- a/etc/sway/modes/recording.conf
+++ b/etc/sway/modes/recording.conf
@@ -16,4 +16,4 @@ mode --pango_markup $mode_recording {
 $bindsym $mod+Shift+r mode $mode_recording
 
 ## Launch // Stop Recording Mode ##
-$bindsym $mod+Escape exec killall -s SIGINT wf-recorder
+$bindsym $mod+Escape exec $recorder
diff --git a/usr/share/sway/scripts/recorder.sh b/usr/share/sway/scripts/recorder.sh
index 6909ac4..eae2abd 100755
--- a/usr/share/sway/scripts/recorder.sh
+++ b/usr/share/sway/scripts/recorder.sh
@@ -1,8 +1,4 @@
 #!/bin/bash
-set -x
-
-pgrep wf-recorder
-status=$?
 
 countdown() {
   notify "Recording in 3 seconds" -t 1000
@@ -19,7 +15,28 @@ notify() {
   notify-send "${line}" -i /usr/share/icons/Yaru/scalable/devices/camera-video-symbolic.svg "$@"
 }
 
-if [ $status != 0 ]; then
+kill_waybar() {
+  pkill -RTMIN+8 waybar
+}
+
+kill_recursive() {
+  ps -o sid= -p "$1" | xargs pkill --signal SIGINT -g
+}
+
+cleanup() {
+  pid=$(cat "$1")
+  rm "$1"
+  kill_waybar
+  kill_recursive "$pid"
+  exit
+}
+
+main() {
+  pid_file="/tmp/screenrecorder-$UID.pid"
+
+  test -e "$pid_file" && cleanup "$pid_file"
+  echo "$$" > "$pid_file"
+
   target_path=$(xdg-user-dir VIDEOS)
   timestamp=$(date +'recording_%Y%m%d-%H%M%S')
 
@@ -27,7 +44,7 @@ if [ $status != 0 ]; then
   area=$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | .rect | "\(.x),\(.y) \(.width)x\(.height)"' | slurp)
 
   countdown
-  (sleep 0.5 && pkill -RTMIN+8 waybar) &
+  (sleep 0.5 && kill_waybar) &
 
   if [ "$1" == "-a" ]; then
     file="$target_path/$timestamp.mp4"
@@ -37,8 +54,7 @@ if [ $status != 0 ]; then
     wf-recorder -g "$area" -c libvpx --codec-param="qmin=0" --codec-param="qmax=25" --codec-param="crf=4" --codec-param="b:v=1M" --file="$file"
   fi
 
-  pkill -RTMIN+8 waybar && notify "Finished recording ${file}"
-else
-  pkill --signal SIGINT wf-recorder
-  pkill -RTMIN+8 waybar
-fi
+  kill_waybar && notify "Finished recording ${file}"
+  rm $pid_file
+}
+main "$@"