diff --git a/core/block_svg.js b/core/block_svg.js
index e10507fe8..90fce83c5 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -676,6 +676,11 @@ Blockly.BlockSvg.prototype.tab = function(start, forward) {
   if (nextNode && nextNode !== currentNode) {
     var nextField = /** @type {!Blockly.Field} */ (nextNode.getLocation());
     nextField.showEditor();
+
+    // Also move the cursor if we're in keyboard nav mode.
+    if (this.workspace.keyboardAccessibilityMode) {
+      this.workspace.getCursor().setCurNode(nextNode);
+    }
   }
 };