diff --git a/data/keys b/data/keys
index 7e2557c3..0567d04e 100644
--- a/data/keys
+++ b/data/keys
@@ -39,8 +39,8 @@ OnTitlebar Mouse2 :Lower
 OnTitlebar Mouse3 :WindowMenu
 
 # alt-tab
-Mod1 Tab :NextWindow {groups}
-Mod1 Shift Tab :PrevWindow {groups}
+Mod1 Tab :NextWindow {groups} (workspace=[current])
+Mod1 Shift Tab :PrevWindow {groups} (workspace=[current])
 
 # cycle through tabs in the current window
 Mod4 Tab :NextTab
diff --git a/src/Keys.cc b/src/Keys.cc
index d3d0ea22..d3b82e94 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -360,8 +360,8 @@ void Keys::loadDefaults() {
     addBinding("OnLeftGrip Move1 :StartResizing bottomleft");
     addBinding("OnRightGrip Move1 :StartResizing bottomright");
     addBinding("OnWindowBorder Move1 :StartMoving");
-    addBinding("Mod1 Tab :NextWindow");
-    addBinding("Mod1 Shift Tab :PrevWindow");
+    addBinding("Mod1 Tab :NextWindow (workspace=[current])");
+    addBinding("Mod1 Shift Tab :PrevWindow (workspace=[current])");
     keyMode("default");
 }