diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc
index e086f5d..55d4e69 100644
--- a/dotfiles/.bashrc
+++ b/dotfiles/.bashrc
@@ -33,9 +33,6 @@ export PS1="${Yellow}\d \A ${Off}${Green}\u@\h: ${Off}\w ${Red}\$(parse_branch g
 hash fzf 2>/dev/null && eval "$(fzf --bash)"
 export FZF_DEFAULT_OPTS='--border=horizontal --info=inline --no-reverse --height=50%'
 
-# Change to saved working dir.
-[[ -f "${HOME}/.cwd" ]] && cd "$(< ${HOME}/.cwd)"
-
 # Use gpg-agent as ssh agent (and get a nice graphical prompt).
 unset SSH_AGENT_PID
 if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
diff --git a/dotfiles/.config/sway/config.d/90-bindings.conf b/dotfiles/.config/sway/config.d/90-bindings.conf
index 04588c0..d070688 100644
--- a/dotfiles/.config/sway/config.d/90-bindings.conf
+++ b/dotfiles/.config/sway/config.d/90-bindings.conf
@@ -4,6 +4,7 @@
 #
     # start a terminal
     bindsym $mod+Return exec $term
+    bindsym $mod+Shift+Return exec $term --working-directory=$(cat ~/.cwd || $HOME)
 
     # kill focused window
     bindsym $mod+Shift+q kill