diff --git a/core/field_angle.js b/core/field_angle.js
index df1d6252a..0e6f05be5 100644
--- a/core/field_angle.js
+++ b/core/field_angle.js
@@ -307,6 +307,7 @@ Blockly.FieldAngle.prototype.updateGraph_ = function() {
   }
   // Always display the input (i.e. getText) even if it is invalid.
   var angleDegrees = Number(this.getText()) + Blockly.FieldAngle.OFFSET;
+  angleDegrees = angleDegrees % 360;
   var angleRadians = Blockly.utils.toRadians(angleDegrees);
   var path = ['M ', Blockly.FieldAngle.HALF, ',', Blockly.FieldAngle.HALF];
   var x2 = Blockly.FieldAngle.HALF;