diff --git a/templates/i3/i3 b/templates/i3/i3
index 130ad04..2c85d2f 100644
--- a/templates/i3/i3
+++ b/templates/i3/i3
@@ -198,11 +198,11 @@ bindsym $mod+Shift+8 move container to workspace number $ws8
 bindsym $mod+Shift+9 move container to workspace number $ws9
 bindsym $mod+Shift+0 move container to workspace number $ws10
 
-bindsym Ctrl+$alt+Left  workspace prev
-bindsym Ctrl+$alt+Right workspace next
+bindsym Ctrl+$alt+Left  workspace prev_on_output
+bindsym Ctrl+$alt+Right workspace next_on_output
 
-bindsym Ctrl+Shift+$alt+Left move container to workspace prev
-bindsym Ctrl+Shift+$alt+Right move container to workspace next
+bindsym Ctrl+Shift+$alt+Left move container to workspace prev_on_output; workspace prev_on_output
+bindsym Ctrl+Shift+$alt+Right move container to workspace next_on_output; workspace next_on_output
 
 # lock the screen
 bindsym $mod+l exec "loginctl lock-session"