diff --git a/config/skhd/skhdrc b/config/skhd/skhdrc
index c87c6a8..4c24f8f 100644
--- a/config/skhd/skhdrc
+++ b/config/skhd/skhdrc
@@ -2,14 +2,14 @@
 rctrl - return : ~/.local/bin/kit new-window --window-type os
 
 # focus window
-rctrl - j : yabai -m window --focus next
-rctrl - k : yabai -m window --focus prev
-cmd         - tab : yabai -m window --focus next
-cmd + shift - tab : yabai -m window --focus prev
+rctrl - j : yabai -m window --focus next || yabai -m window --focus first
+rctrl - k : yabai -m window --focus prev || yabai -m window --focus last
+cmd         - tab : yabai -m window --focus next || yabai -m window --focus first
+cmd + shift - tab : yabai -m window --focus prev || yabai -m window --focus last
 
 # swap window
-rctrl + shift - j : yabai -m window --swap next
-rctrl + shift - k : yabai -m window --swap prev
+rctrl + shift - j : yabai -m window --swap next || yabai -m window --swap first
+rctrl + shift - k : yabai -m window --swap prev || yabai -m window --swap last
 
 # balance size of windows (mod =)
 rctrl - 0x18 :  yabai -m space --balance