diff --git a/home/user/.config/tmux/mappings.conf b/home/user/.config/tmux/mappings.conf
index ca31546..29d8ccb 100644
--- a/home/user/.config/tmux/mappings.conf
+++ b/home/user/.config/tmux/mappings.conf
@@ -62,14 +62,11 @@ bind -n M-f resize-pane -Z
 
 
 # Link window
-bind L command-prompt -p "Link window from (session:window):" "link-window -s %% -a"
+bind l choose-window -w -Z 'link-window -s "%%" -a'
+bind u unlink-window
 
 # Join pane
-bind J choose-window -Z 'join-pane -s "%%"'
-
-
-# Lock screen
-bind l confirm-before -p "lock tmux? (y/n)" lock-session
+bind j choose-window -Z 'join-pane -s "%%"'
 
 
 # Reload config