diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs
index a6669cad24..94729755a2 100644
--- a/common/src/comp/ability.rs
+++ b/common/src/comp/ability.rs
@@ -1071,7 +1071,6 @@ impl CharacterAbility {
             && match self {
                 CharacterAbility::Roll { energy_cost, .. } => {
                     data.physics.on_ground.is_some()
-                        && data.inputs.move_dir.magnitude_squared() > 0.25
                         && update.energy.try_change_by(-*energy_cost).is_ok()
                 },
                 CharacterAbility::DashMelee { energy_cost, .. }
diff --git a/voxygen/src/key_state.rs b/voxygen/src/key_state.rs
index 281fa9ff00..9d517e5131 100644
--- a/voxygen/src/key_state.rs
+++ b/voxygen/src/key_state.rs
@@ -44,6 +44,8 @@ impl KeyState {
                 if self.up || self.auto_walk { 1.0 } else { 0.0 }
                     + if self.down { -1.0 } else { 0.0 },
             )
+            .try_normalized()
+            .unwrap_or_default()
         } else {
             self.analog_matrix
         } * self.speed_mul;