diff --git a/src/layout/monitor.rs b/src/layout/monitor.rs
index 6c2a906a..01602001 100644
--- a/src/layout/monitor.rs
+++ b/src/layout/monitor.rs
@@ -1820,7 +1820,9 @@ impl<W: LayoutElement> Monitor<W> {
 
         velocity *= rubber_band.clamp_derivative(min, max, gesture.start_idx + current_pos);
 
-        self.previous_workspace_id = Some(self.workspaces[self.active_workspace_idx].id());
+        if self.active_workspace_idx != new_idx {
+            self.previous_workspace_id = Some(self.workspaces[self.active_workspace_idx].id());
+        }
 
         self.active_workspace_idx = new_idx;
         self.workspace_switch = Some(WorkspaceSwitch::Animation(Animation::new(