diff --git a/core/field_angle.js b/core/field_angle.js
index cd1138aec..de6f2c7f2 100644
--- a/core/field_angle.js
+++ b/core/field_angle.js
@@ -267,7 +267,10 @@ Blockly.FieldAngle.prototype.onMouseMove = function(e) {
   if (Blockly.FieldAngle.CLOCKWISE) {
     angle = Blockly.FieldAngle.OFFSET + 360 - angle;
   } else {
-    angle -= Blockly.FieldAngle.OFFSET;
+    angle = 360 - (Blockly.FieldAngle.OFFSET - angle);
+  }
+  if (angle > 360) {
+    angle -= 360;
   }
   if (Blockly.FieldAngle.ROUND) {
     angle = Math.round(angle / Blockly.FieldAngle.ROUND) *