diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c
index b6cff89df..ae9ab2263 100644
--- a/src/game/bondwalk.c
+++ b/src/game/bondwalk.c
@@ -1354,16 +1354,16 @@ void bwalkApplyMoveData(struct movedata *data)
 			bwalkSetSwayTarget(-1);
 		} else if (data->rleanright) {
 			bwalkSetSwayTarget(1);
-		} else if (data->analoglean && bmoveIsInSightAimMode()) {
+		} else if (fabsf(data->analoglean)) {
 			bwalkSetSwayTargetf(data->analoglean);
 		} else {
 			bwalkSetSwayTarget(0);
 		}
 #else
-		if (data->rleanright) {
+		if (data->rleanleft) {
+			bwalkSetSwayTarget(-1);
+		} else if (data->rleanright) {
 			bwalkSetSwayTarget(1);
-		} else if (data->analoglean && bmoveIsInSightAimMode()) {
-			bwalkSetSwayTargetf(data->analoglean);
 		} else {
 			bwalkSetSwayTarget(0);
 		}