diff --git a/core/math/math.odin b/core/math/math.odin
index 957e1672b..cf6630ef2 100644
--- a/core/math/math.odin
+++ b/core/math/math.odin
@@ -402,7 +402,8 @@ remap :: proc "contextless" (old_value, old_min, old_max, new_min, new_max: $T)
 	if old_range == 0 {
 		return new_range / 2
 	}
-	return ((old_value - old_min) / old_range) * new_range + new_min
+	remapped := ((old_value - old_min) / old_range) * new_range + new_min
+	return clamp(remapped, new_min, new_max)
 }
 
 @(require_results)