diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c49ede..a69d383 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 ### Bugfixes
 - Fixed a bug that sometimes measured diagonals incorrectly with the 5/10/5 grid rule
+- Fixed a bug that would cause the ruler to re-measure when the shift key is being pressed or released while a token is moving
 
 ### Compatibility
 - Drag Ruler's Generic Speed Provider is now aware of good default values for the Starfinder game system
diff --git a/src/main.js b/src/main.js
index cdb42a7..c2d7005 100644
--- a/src/main.js
+++ b/src/main.js
@@ -115,6 +115,8 @@ function onKeyShift(up) {
 	const ruler = canvas.controls.ruler
 	if (!ruler.isDragRuler)
 		return false
+	if (ruler._state !== Ruler.STATES.MEASURING)
+		return false;
 
 	const mousePosition = canvas.app.renderer.plugins.interaction.mouse.getLocalPosition(canvas.tokens)
 	const rulerOffset = ruler.rulerOffset