diff --git a/.scripts/i3cmds/samedir b/.scripts/i3cmds/samedir
index 7d65838..88845fc 100755
--- a/.scripts/i3cmds/samedir
+++ b/.scripts/i3cmds/samedir
@@ -1,27 +1,5 @@
 #!/bin/sh
-# i3 thread: https://faq.i3wm.org/question/150/how-to-launch-a-terminal-from-here/?answer=152#post-id-152
-
-CMD=$TERMINAL
-CWD=''
-
-# Get window ID
-ID=$(xdpyinfo | grep focus | cut -f4 -d " ")
-
-# Get PID of process whose window this is
-PID=$(xprop -id "$ID" | grep -m 1 PID | cut -d " " -f 3)
-
-# Get last child process (shell, vim, etc)
-if [ -n "$PID" ]; then
-  TREE=$(pstree -lpA "$PID" | tail -n 1)
-  PID=$(echo "$TREE" | awk -F'---' '{print $NF}' | sed -re 's/[^0-9]//g')
-
-  # If we find the working directory, run the command in that directory
-  if [ -e "/proc/$PID/cwd" ]; then
-    CWD=$(readlink /proc/"$PID"/cwd)
-  fi
-fi
-if [ -n "$CWD" ]; then
-  cd "$CWD" && "$CMD"
-else
-  "$CMD"
-fi
+PID=$(xprop -id "$(xprop -root | awk '/_NET_ACTIVE_WINDOW\(WINDOW\)/{print $NF}')" | grep -m 1 PID | cut -d " " -f 3)
+PID=$(echo "$(pstree -lpA "$PID" | tail -n 1)" | awk -F'---' '{print $NF}' | sed -re 's/[^0-9]//g')
+cd "$(readlink /proc/"$PID"/cwd)"
+"$TERMINAL"